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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 1544 by tim, Fri Oct 8 22:10:22 2004 UTC vs.
Revision 1545 by tim, Fri Oct 8 22:51:06 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 329 | Line 329 | MyInstallDir             = $(BinDir)/
329   endif
330  
331   ifneq "$(words $(Main))" "0"
332 < MyInstallDir             = $(BinDir)/
332 > MyInstallDir             = $(InstallBinDir)
333   InstallFiles             = $(Executable) $(ParallelExecutable)
334   InstallCommand           = $(InstallProgram)
335   endif
336  
337 < ifneq "$(words $(ForcefiledFiles))" "0"
337 > ifneq "$(words $(ForcefieldFiles))" "0"
338   MyInstallDir             = $(ForceParamDir)
339 < InstallFiles             = $(ForcefiledFiles)/
339 > InstallFiles             = $(ForcefieldFiles)
340   InstallCommand           = $(InstallData)
341   endif
342  
343   ifneq "$(words $(InstallFiles))" "0"
344    InstallList            =
345   else
346 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(patsubst %, $(DEV_ROOT)/%,$(Forcefield)) $(patsubst %, $(SourceDir)/%,$(Applications))
346 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
347   endif
348  
349   InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
# Line 682 | Line 682 | endif      
682   ifneq "$(words $(InstallFiles))" "0"
683          $(InstallData) $(InstallFiles) $(MyInstallDir)
684   endif      
685
686 _installprogram:
685          
686   # make statistics
687   _statisticsall :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines