Wrap parmchk2 and parmchk to eliminate AMBERHOME requirements for tho…

…se programs

as well.

Makefile

@@ -2,7 +2,7 @@ include config.h
 
 PROGS=antechamber acdoctor am1bcc antechamber_pvt atomtype bondtype charmmgen \
 		database espgen parmcal parmchk parmchk2 prepgen residuegen sqm teLeap \
-		tleap translate
+		tleap translate parmchk_pvt parmchk2_pvt
 
 all: prep libs
 	$(MAKE) antechamber

antechamber/Makefile

@@ -14,7 +14,9 @@ PROGS = \
 	$(BINDIR)/espgen$(SFX) \
 	$(BINDIR)/parmcal$(SFX) \
 	$(BINDIR)/parmchk$(SFX) \
+	$(BINDIR)/parmchk_pvt$(SFX) \
 	$(BINDIR)/parmchk2$(SFX) \
+	$(BINDIR)/parmchk2_pvt$(SFX) \
 	$(BINDIR)/prepgen$(SFX) \
 	$(BINDIR)/residuegen$(SFX) \
 	$(BINDIR)/respgen$(SFX) \
@@ -270,11 +272,17 @@ $(BINDIR)/espgen$(SFX): espgen.o
 $(BINDIR)/parmcal$(SFX): parmcal.o
 	$(CC) $(CFLAGS) $(AMBERCFLAGS) $(LDFLAGS) $(AMBERLDFLAGS) parmcal.o $(LM) -o $(BINDIR)/parmcal$(SFX)
 
-$(BINDIR)/parmchk$(SFX): parmchk.o
-	$(CC) $(CFLAGS) $(AMBERCFLAGS) $(LDFLAGS) $(AMBERLDFLAGS) parmchk.o $(LM) -o $(BINDIR)/parmchk$(SFX)
+$(BINDIR)/parmchk$(SFX):
+	/bin/cp -L parmchk $(BINDIR)
 
-$(BINDIR)/parmchk2$(SFX): parmchk2.o
-	$(CC) $(CFLAGS) $(AMBERCFLAGS) $(LDFLAGS) $(AMBERLDFLAGS) parmchk2.o $(LM) -o $(BINDIR)/parmchk2$(SFX)
+$(BINDIR)/parmchk_pvt$(SFX): parmchk.o
+	$(CC) $(CFLAGS) $(AMBERCFLAGS) $(LDFLAGS) $(AMBERLDFLAGS) parmchk.o $(LM) -o $(BINDIR)/parmchk_pvt$(SFX)
+
+$(BINDIR)/parmchk2$(SFX):
+	/bin/cp -L parmchk2 $(BINDIR)
+
+$(BINDIR)/parmchk2_pvt$(SFX): parmchk2.o
+	$(CC) $(CFLAGS) $(AMBERCFLAGS) $(LDFLAGS) $(AMBERLDFLAGS) parmchk2.o $(LM) -o $(BINDIR)/parmchk2_pvt$(SFX)
 
 $(BINDIR)/parmjoin$(SFX): parmjoin.o
 	$(CC) $(CFLAGS) $(AMBERCFLAGS) $(LDFLAGS) $(AMBERLDFLAGS) parmjoin.o -o $(BINDIR)/parmjoin$(SFX)

antechamber/parmchk

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Shell script to wrap parmchk so it knows where to find the necessary data
+# files
+
+amberhome=`dirname $0`
+
+# Point AMBERHOME to the location that has dat/leap
+export AMBERHOME="$amberhome/.."
+
+`dirname $0`/parmchk_pvt $@

antechamber/parmchk2

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Shell script to wrap parmchk2 so it knows where to find the necessary data
+# files
+
+amberhome=`dirname $0`
+
+# Point AMBERHOME to the location that has dat/leap
+export AMBERHOME="$amberhome/.."
+
+`dirname $0`/parmchk2_pvt $@