--- trunk/OOPSE-2.0/make/Makefile.in	2004/10/08 22:10:22	1544
+++ trunk/OOPSE-2.0/make/Makefile.in	2004/10/11 18:01:51	1553
@@ -86,10 +86,10 @@ ForceParamDir   = @OOPSE_HOME@/share/forceFields/
 	@MPI_F90_LIB@
 
 OopseHome       = @OOPSE_HOME@
-ForceParamDir   = @OOPSE_HOME@/share/forceFields/
-SampleSimDir    = @OOPSE_HOME@/share/samples/
-BinDir          = @OOPSE_HOME@/bin
-DocDir          = @OOPSE_HOME@/doc
+ForceParamDir   = $(OopseHome)/share/forceFields
+SampleSimDir    = $(OopseHome)/share/samples
+InstallBinDir   = $(OopseHome)/bin
+DocDir          = $(OopseHome)/doc
 FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
 F90Declare      = -D__FORTRAN90
 ParallelDeclare = -DIS_MPI
@@ -253,7 +253,7 @@ Install                = @INSTALL@
 CppCompiler            = @CXX@
 Linker                 = @CXX@
 MakeDepend             = makedepend
-Install                = @INSTALL@
+INSTALL                = @INSTALL@
 InstallProgram         = @INSTALL_PROGRAM@
 InstallData            = @INSTALL_DATA@
 MkDir                = @MKINSTALLDIRS@
@@ -322,28 +322,32 @@ MySample                 = $(subst $(shell cd $(DEV_RO
 #---------------------------------------------------------------------------
 
 ifneq "$(words $(SampleFiles))" "0"
-MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
-MyInstallDir             = $(SampleSimDir)/$(MySample)
-InstallFiles             = $(SampleFiles)
-InstallCommand           = $(InstallData)
+  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
+  MyInstallDir             = $(SampleSimDir)/$(MySample)
+  InstallFiles             = $(SampleFiles)
+  InstallCommand           = $(InstallData)
 endif
 
 ifneq "$(words $(Main))" "0"
-MyInstallDir             = $(BinDir)/
-InstallFiles             = $(Executable) $(ParallelExecutable)
-InstallCommand           = $(InstallProgram)
+  MyInstallDir             = $(InstallBinDir)
+  ifeq "$(UseMPI)" "yes"
+    InstallFiles             = $(Executable) $(ParallelExecutable)
+  else
+    InstallFiles             = $(Executable)
+  endif 
+  InstallCommand           = $(InstallProgram)
 endif
 
-ifneq "$(words $(ForcefiledFiles))" "0"
-MyInstallDir             = $(ForceParamDir)
-InstallFiles             = $(ForcefiledFiles)/
-InstallCommand           = $(InstallData)
+ifneq "$(words $(ForcefieldFiles))" "0"
+  MyInstallDir             = $(ForceParamDir)
+  InstallFiles             = $(ForcefieldFiles)
+  InstallCommand           = $(InstallData)
 endif
 
 ifneq "$(words $(InstallFiles))" "0"
   InstallList            =
 else
-  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications)) 
+  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications)) 
 endif
 
 InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList)) 
@@ -417,17 +421,35 @@ $(PackageTargetDir)/%.o : %.F90
 # .F90 -> .o
 $(PackageTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
+	if test -f *.$(ModSuffix); then \
+	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
+	fi
 
 $(PackageParallelTargetDir)/%.o : %.F90
 	$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
+	if test -f *.$(ModSuffix); then \
+	  $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
+	fi
 
 ifeq "$(UseMPI)" "yes"
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
+	if test -f *.$(ModSuffix); then \
+	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
+	fi
+
 	$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
+	if test -f *.$(ModSuffix); then \
+	  $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
+	fi
+
 else
 %.o : %.F90
 	$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
+	if test -f *.$(ModSuffix); then \
+	  $(Move) *.$(ModSuffix) $(PackageTargetDir);\
+	fi
+
 endif
 
 
@@ -682,8 +704,6 @@ endif	    
 ifneq "$(words $(InstallFiles))" "0"
 	$(InstallData) $(InstallFiles) $(MyInstallDir)
 endif	    
-
-_installprogram:
 	
 # make statistics
 _statisticsall :