""

svn path=/trunk/; revision=562

6 files changed, 7 insertions, 8 deletions

diff --git a/externals/grill/vasp/config-pd-cygwin.txt b/externals/grill/vasp/config-pd-cygwin.txt
index d9932ada..06dd61aa 100644
--- a/externals/grill/vasp/config-pd-cygwin.txt
+++ b/externals/grill/vasp/config-pd-cygwin.txt
@@ -16,7 +16,7 @@ PDINC=${PD}/src
 # where do the flext libraries reside?
 FLEXTPATH=${PD}/flext
 
-# where should flext libraries be built?
+# where should VASP be built?
 TARGDIR=./pd-cygwin
 
 # where should VASP be installed?
diff --git a/externals/grill/vasp/make-files.txt b/externals/grill/vasp/make-files.txt
index 50ecb538..abedf02b 100644
--- a/externals/grill/vasp/make-files.txt
+++ b/externals/grill/vasp/make-files.txt
@@ -1,4 +1,6 @@
 # all the source files from the package
+SRCDIR=source
+
 SRCS= \
 arg.cpp      mixfft.cpp      obj_part.cpp   obj_split.cpp  opparam.cpp     ops_cplx.cpp     ops_gen.cpp      ops_trnsc.cpp  util.cpp \
 buflib.cpp   obj_chns.cpp    obj_peaks.cpp  obj_sync.cpp   ops_arith.cpp   ops_dft.cpp      ops_qminmax.cpp  ops_wnd.cpp    vasp.cpp \
diff --git a/externals/grill/vasp/makefile.pd-cygwin b/externals/grill/vasp/makefile.pd-cygwin
index 454c3167..0f408436 100644
--- a/externals/grill/vasp/makefile.pd-cygwin
+++ b/externals/grill/vasp/makefile.pd-cygwin
@@ -28,7 +28,6 @@ LIBS=m
 # ----------------------------------------------
 
 NAME=vasp
-SRCDIR=source
 
 include make-files.txt
 
diff --git a/externals/grill/vasp/makefile.pd-darwin b/externals/grill/vasp/makefile.pd-darwin
index 7d9eeb8a..89ee3f47 100755
--- a/externals/grill/vasp/makefile.pd-darwin
+++ b/externals/grill/vasp/makefile.pd-darwin
@@ -29,7 +29,6 @@ FRAMEWORKS=Carbon
 # ----------------------------------------------
 
 NAME=vasp
-SRCDIR=source
 
 include make-files.txt
 
diff --git a/externals/grill/vasp/makefile.pd-linux b/externals/grill/vasp/makefile.pd-linux
index 3bb424c0..4caa0097 100644
--- a/externals/grill/vasp/makefile.pd-linux
+++ b/externals/grill/vasp/makefile.pd-linux
@@ -9,7 +9,9 @@
 # to install help, do "make -f makefile.pd-linux install-help"
 #
 
-include config-pd-linux.txt
+CONFIG=config-pd-linux.txt
+
+include ${CONFIG}
 
 FLEXTLIB=$(FLEXTPATH)/flext_t.a
 
@@ -27,7 +29,6 @@ LIBS=m
 # ----------------------------------------------
 
 NAME=vasp
-SRCDIR=source
 
 include make-files.txt
 
diff --git a/externals/grill/vasp/makefile.pd-msvc b/externals/grill/vasp/makefile.pd-msvc
index 9f55ea1a..1ab086f8 100644
--- a/externals/grill/vasp/makefile.pd-msvc
+++ b/externals/grill/vasp/makefile.pd-msvc
@@ -24,8 +24,6 @@ CFLAGS=/GR /GX- /GD /G6 /Ox /MT
 
 NAME=vasp
 
-DIR=source
-
 !include make-files.txt
 
 
@@ -43,7 +41,7 @@ $(OUTPATH):
 
 # bad tricks here... the obj's are phantom files... no real make
 
-{$(DIR)}.cpp.obj:
+{$(SRCDIR)}.cpp.obj:
 	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@
 
 $(OUTPATH)\$(NAME).dll: $(OBJS)