From fc320fab8cce979689630ecb1b03826b8d987362 Mon Sep 17 00:00:00 2001
From: Dave Goodwin <dgg@caltech.edu>
Date: Mon, 12 Jan 2004 08:50:39 +0000
Subject: [PATCH] *** empty log message ***

---
 Cantera/cxx/demos/Makefile      | 13 ++++++++++++-
 Makefile.in                     |  9 +++++----
 tools/templates/cxx/demo.mak.in |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Cantera/cxx/demos/Makefile b/Cantera/cxx/demos/Makefile
index ae251d3ba..3a5324bf1 100644
--- a/Cantera/cxx/demos/Makefile
+++ b/Cantera/cxx/demos/Makefile
@@ -1,3 +1,9 @@
+# This Makefile uses script 'ctnew' to create the Makefiles for each
+# demo program. This script is created during the Cantera build
+# process, and is installed by default in /usr/local/bin.
+
+# if script ctnew is not on the PATH, set this to the path to it.
+CTNEW = ctnew
 
 SRCS = kinetics1.cpp
 
@@ -8,11 +14,16 @@ MKS = $(SRCS:.cpp=.mak)
 all: $(EXES)
 
 %.mak:
-	ctnew; sed 's/demo/$*/g' demo.mak > $*.mak
+	$(CTNEW); sed 's/demo/$*/g' demo.mak > $*.mak
 
 %.x:
+	@echo
+	@echo Building program $*.x...
+	@echo
 	make $*.mak; make -f $*.mak; mv $* $*.x
+	@echo
 	@echo type '$*.x' to run the program
+	@echo
 
 clean:
 	rm -f $(OBJS) $(EXES) $(MKS)
diff --git a/Makefile.in b/Makefile.in
index 87c3bb0a2..15a41053c 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,10 +146,11 @@ endif
 finish-install:
 	@INSTALL@ -d @ct_docdir@
 	#@INSTALL@ doc/*.pdf @ct_docdir@
-	@INSTALL@ -d @ct_demodir@/c++
-	@INSTALL@ examples/cxx/*.cpp @ct_demodir@/c++
-	@INSTALL@ examples/cxx/*.h @ct_demodir@/c++
-	@INSTALL@ examples/cxx/Makefile @ct_demodir@/c++
+
+	@INSTALL@ -d @ct_demodir@/cxx
+	@INSTALL@ Cantera/cxx/demos/*.cpp @ct_demodir@/cxx
+	@INSTALL@ Cantera/cxx/demos/*.h @ct_demodir@/cxx
+	@INSTALL@ Cantera/cxx/demos/Makefile @ct_demodir@/cxx
 	chown -R @username@ @ct_demodir@/c++
 
 	@INSTALL@ -d @ct_demodir@/f77
diff --git a/tools/templates/cxx/demo.mak.in b/tools/templates/cxx/demo.mak.in
index 77f176f4a..d58a4714d 100644
--- a/tools/templates/cxx/demo.mak.in
+++ b/tools/templates/cxx/demo.mak.in
@@ -58,7 +58,7 @@ $(PROGRAM): $(OBJS)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXXFLAGS) $(CANTERA_LIBS) $(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ @FLIBS@
 
 %.d:
-	g++ -MM $*.cpp > $*.d
+	g++ -MM -I$(CANTERA_INCDIR) $*.cpp > $*.d
 
 clean:
 	$(RM) $(OBJS) $(PROGRAM)