ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/make/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-2.0/make/Makefile.in (file contents):
Revision 1544 by tim, Fri Oct 8 22:10:22 2004 UTC vs.
Revision 1546 by tim, Fri Oct 8 23:15:07 2004 UTC

# Line 86 | Line 86 | ForceParamDir   = @OOPSE_HOME@/share/forceFields/
86          @MPI_F90_LIB@
87  
88   OopseHome       = @OOPSE_HOME@
89 < ForceParamDir   = @OOPSE_HOME@/share/forceFields/
90 < SampleSimDir    = @OOPSE_HOME@/share/samples/
91 < BinDir          = @OOPSE_HOME@/bin
89 > ForceParamDir   = @OOPSE_HOME@/share/forceFields
90 > SampleSimDir    = @OOPSE_HOME@/share/samples
91 > InstallBinDir   = @OOPSE_HOME@/bin
92   DocDir          = @OOPSE_HOME@/doc
93   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
94   F90Declare      = -D__FORTRAN90
# Line 322 | Line 322 | MySample                 = $(subst $(shell cd $(DEV_RO
322   #---------------------------------------------------------------------------
323  
324   ifneq "$(words $(SampleFiles))" "0"
325 < MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
326 < MyInstallDir             = $(SampleSimDir)/$(MySample)
327 < InstallFiles             = $(SampleFiles)
328 < InstallCommand           = $(InstallData)
325 >  MySample                 = $(subst $(shell cd $(DEV_ROOT)/samples; pwd)/,,$(CurrentDir))
326 >  MyInstallDir             = $(SampleSimDir)/$(MySample)
327 >  InstallFiles             = $(SampleFiles)
328 >  InstallCommand           = $(InstallData)
329   endif
330  
331   ifneq "$(words $(Main))" "0"
332 < MyInstallDir             = $(BinDir)/
333 < InstallFiles             = $(Executable) $(ParallelExecutable)
334 < InstallCommand           = $(InstallProgram)
332 >  MyInstallDir             = $(InstallBinDir)
333 >  ifeq "$(UseMPI)" "yes"
334 >    InstallFiles             = $(Executable) $(ParallelExecutable)
335 >  else
336 >    InstallFiles             = $(Executable)
337 >  endif
338 >  InstallCommand           = $(InstallProgram)
339   endif
340  
341 < ifneq "$(words $(ForcefiledFiles))" "0"
342 < MyInstallDir             = $(ForceParamDir)
343 < InstallFiles             = $(ForcefiledFiles)/
344 < InstallCommand           = $(InstallData)
341 > ifneq "$(words $(ForcefieldFiles))" "0"
342 >  MyInstallDir             = $(ForceParamDir)
343 >  InstallFiles             = $(ForcefieldFiles)
344 >  InstallCommand           = $(InstallData)
345   endif
346  
347   ifneq "$(words $(InstallFiles))" "0"
348    InstallList            =
349   else
350 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
350 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
351   endif
352  
353   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 682 | Line 686 | endif      
686   ifneq "$(words $(InstallFiles))" "0"
687          $(InstallData) $(InstallFiles) $(MyInstallDir)
688   endif      
685
686 _installprogram:
689          
690   # make statistics
691   _statisticsall :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines