ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1395 by gezelter, Fri Dec 4 17:38:47 2009 UTC

# Line 120 | Line 120 | InstallBinDir   = $(OpenMDHome)/bin
120   ForceParamDir   = $(OpenMDHome)/forceFields
121   SampleSimDir    = $(OpenMDHome)/samples
122   InstallBinDir   = $(OpenMDHome)/bin
123 < DocDir          = $(OpenMDHome)/doc
123 > InstallDocDir   = $(OpenMDHome)/doc
124   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
125   F90Declare      = -D__FORTRAN90
126   UseSingle       = @USE_SINGLE_PRECISION@
# Line 159 | Line 159 | BinDir            = $(DEV_ROOT)/bin
159   MakeDir           = $(DEV_ROOT)/make
160   MainMakefile      = $(MakeDir)/Makefile
161   BinDir            = $(DEV_ROOT)/bin
162 < DocsDir           = $(DEV_ROOT)/docs
162 > DocDir            = $(DEV_ROOT)/doc
163   CurrentDir        = $(CURDIR)
164   CombinedStaticLib = $(LibDir)/libopenmd.a
165   CombinedParallelStaticLib = $(LibDir)/libopenmd_MPI.a
# Line 371 | Line 371 | InstallData            = @INSTALL_DATA@
371   InstallProgram         = @INSTALL_PROGRAM@
372   InstallScript          = @INSTALL_SCRIPT@
373   InstallData            = @INSTALL_DATA@
374 < MkDir                  = @MKINSTALLDIRS@
374 > MkDir                  = @MKINSTALLDIRS@ -m 655
375   Delete                 = rm -f
376   StaticArchiver         = @AR@
377   DynamicArchiver        = @CC@
# Line 414 | Line 414 | PurifyOptions          =
414                           -sourcepath $(SourceDir) -deprecation
415   JavaRunOptions         = -classpath $(ClassPath)
416   PurifyOptions          =
417 < JavadocOptions         = -d $(DocsDir) \
417 > JavadocOptions         = -d $(DocDir) \
418                           -sourcepath $(SourceDir) \
419                           -classpath $(ClassPath) \
420                           -author \
# Line 484 | Line 484 | endif
484    InstallCommand           = $(InstallData)
485   endif
486  
487 < ifneq "$(words $(InstallFiles))" "0"
487 > ifeq "$(words $(InstallFiles))" "0"
488    InstallList            =
489   else
490 <  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(patsubst %, $(SourceDir)/%,$(Applications))
490 >  InstallList            = $(patsubst %,$(DEV_ROOT)/%,$(Samples)) $(DEV_ROOT)/forceFields $(DocDir) $(DEV_ROOT) $(patsubst %, $(SourceDir)/%,$(Applications))
491   endif
492  
493 < InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
493 > InstallListLoop          = $(patsubst %,$(SourceDir)/%/.install,$(PackageList))  $(patsubst %,%/.install,$(InstallList))
494  
495  
496  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines