""

svn path=/trunk/; revision=281

4 files changed, 18 insertions, 12 deletions

diff --git a/externals/grill/vasp/config-pd-darwin.txt b/externals/grill/vasp/config-pd-darwin.txt
index 596c1d4d..b5b617df 100755
--- a/externals/grill/vasp/config-pd-darwin.txt
+++ b/externals/grill/vasp/config-pd-darwin.txt
@@ -5,16 +5,19 @@
 # your c++ compiler (normally g++)
 CXX=g++
 
+# where does the PD installation reside?
+PD=/usr/local/pd
+
 # where are the PD header files?
 # leave it blank if it is a system directory (like /usr/local/include), 
 # 	since gcc 3.2 complains about it
-PDPATH=/usr/local/pd/src
+PDINC=${PD}/src
 
 # where is the PD executable?
-PD=/usr/local/pd/bin/pd
+PDBIN=${PD}/bin/pd
 
 # where do the flext libraries reside?
-FLEXTPATH=/usr/local/pd/flext
+FLEXTPATH=${PD}/flext
 
 # where should flext libraries be built?
 TARGDIR=./pd-darwin
@@ -22,9 +25,9 @@ TARGDIR=./pd-darwin
 # where should VASP be installed?
 # (leave blank to omit installation)
 # a subfolder "vasp" will be created for the files
-INSTDIR=/usr/local/pd/extra
+INSTDIR=${PD}/extra
 
 # where should the VASP help be installed?
 # (leave blank to omit installation)
 # a subfolder "vasp" will be created for the files
-HELPDIR=/usr/local/pd/doc/5.reference
+HELPDIR=${PD}/doc/5.reference
diff --git a/externals/grill/vasp/config-pd-linux.txt b/externals/grill/vasp/config-pd-linux.txt
index 0a01f364..9a5a177f 100644
--- a/externals/grill/vasp/config-pd-linux.txt
+++ b/externals/grill/vasp/config-pd-linux.txt
@@ -5,13 +5,16 @@
 # your c++ compiler (normally g++)
 CXX=g++
 
+# where does the PD installation reside?
+PD=/usr/local/pd
+
 # where are the PD header files?
 # leave it blank if it is a system directory (like /usr/local/include), 
 # 	since gcc 3.2 complains about it
-PDPATH=
+PDINC=
 
 # where do the flext libraries reside?
-FLEXTPATH=/usr/local/lib/pd/flext
+FLEXTPATH=${PD}/flext
 
 # where should flext libraries be built?
 TARGDIR=./pd-linux
@@ -19,9 +22,9 @@ TARGDIR=./pd-linux
 # where should VASP be installed?
 # (leave blank to omit installation)
 # a subfolder "vasp" will be created for the files
-INSTDIR=/usr/local/lib/pd/extra
+INSTDIR=${PD}/extra
 
 # where should the VASP help be installed?
 # (leave blank to omit installation)
 # a subfolder "vasp" will be created for the files
-HELPDIR=/usr/local/lib/pd/doc/5.reference
+HELPDIR=${PD}/doc/5.reference
diff --git a/externals/grill/vasp/makefile.pd-darwin b/externals/grill/vasp/makefile.pd-darwin
index 713ad0fd..909e2403 100755
--- a/externals/grill/vasp/makefile.pd-darwin
+++ b/externals/grill/vasp/makefile.pd-darwin
@@ -16,11 +16,11 @@ include ${CONFIG}
 FLEXTLIB=$(FLEXTPATH)/flext_t.a
 
 # compiler stuff
-INCLUDES=$(PDPATH) 
+INCLUDES=$(PDINC) 
 FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
 CFLAGS=-O6 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes # -maltivec
 LIBS=m
-LDFLAGS=-bundle -bundle_loader $(PD)
+LDFLAGS=-bundle -bundle_loader $(PDBIN)
 
 # ----------------------------------------------
 # the rest can stay untouched
diff --git a/externals/grill/vasp/makefile.pd-linux b/externals/grill/vasp/makefile.pd-linux
index 5c156ebe..2acabdc8 100644
--- a/externals/grill/vasp/makefile.pd-linux
+++ b/externals/grill/vasp/makefile.pd-linux
@@ -14,7 +14,7 @@ include config-pd-linux.txt
 FLEXTLIB=$(FLEXTPATH)/flext_t.a
 
 # compiler stuff
-INCLUDES=$(PDPATH) 
+INCLUDES=$(PDINC) 
 FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
 CFLAGS=-O6 -mcpu=pentiumpro -fmove-all-movables -frerun-loop-opt -finline-functions # -funroll-loops 
 #CFLAGS=-O6 -mcpu=pentium3 -msse -mfpmath=sse -fmove-all-movables -frerun-loop-opt -finline-functions # -funroll-loops