--- trunk/OOPSE-2.0/make/Makefile.in	2005/01/13 21:48:09	1938
+++ trunk/OOPSE-2.0/make/Makefile.in	2005/01/14 21:13:24	1951
@@ -123,7 +123,9 @@ Package          = $(subst $(shell cd $(SourceDir); pw
 # /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside
 #Package          = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g')
 #use shell script to get the absolute path and then rip it off from $(CurrentDir)
-Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
+#Package          = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir))
+# REMINDER: We are now using the Package line in each subdir makefile.
+# This avoids the strange path problem and the subshell
 
 PackageList              = $(Package)
 PackageSourceDir         = $(SourceDir)/$(Package)
@@ -285,8 +287,8 @@ CppOptions             = $(FrcDeclare) @CXXFLAGS@
 			 -sourcepath $(SourceDir)
 COptions               = $(FrcDeclare) @CFLAGS@
 CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
-CppOptions             = $(FrcDeclare) @CXXFLAGS@
-CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
+CppOptions             = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
+CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@
 FortranOptions         =
 F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) 
 F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)