--- ../make/Makefile.orig	Tue Nov 13 10:16:27 2001
+++ ../make/Makefile	Mon Dec 31 15:33:40 2001
@@ -9,8 +9,8 @@
 ##
 ##   1. make all              Build all the TINKER executables
 ##   2. make rename           Move the executables to BINDIR
-##   3. make remove_links     Create soft links in LINKDIR
-##   4. make create_links     Remove soft links from LINKDIR
+##   3. make remove_links     Remove soft links in LINKDIR
+##   4. make create_links     Create soft links from LINKDIR
 ##   6. make listing          Concatenate source to tinker.txt
 ##   5. make clean            Delete objects and executables
 ##
@@ -30,9 +30,9 @@
 ##  LINKDIR      Linked Copies of TINKER Executables
 ##
 
-TINKERDIR = /user/ponder/tinker
-BINDIR = $(TINKERDIR)/bin
-LINKDIR = /usr/local/bin
+TINKERDIR = ${WRKDIR}
+BINDIR = ${PREFIX}/bin
+#LINKDIR = /usr/local/bin
 
 ####################################################################
 ##  Known Machine Types; Uncomment One of the Following Sections  ##
@@ -87,12 +87,12 @@
 ##  Compiler: GNU g77
 ##
 
-F77 = /usr/bin/g77
-LIBS =
-F77FLAGS = -c
-OPTFLAGS = -O3 -ffast-math
-LIBFLAGS = -crusv
-LINKFLAGS =
+#F77 = /usr/bin/g77
+#LIBS =
+#F77FLAGS = -c
+#OPTFLAGS = -O3 -ffast-math
+#LIBFLAGS = -crusv
+#LINKFLAGS =
 
 ##
 ##  Machine:  IntelPC / Linux
@@ -108,6 +108,24 @@
 #LIBFLAGS = -crusv
 #LINKFLAGS =
 
+##
+##  Machine:  IntelPC / FreeBSD
+##  CPU Type: Intel, AMD, Cyrix
+##  Oper Sys: FreeBSD 4.2
+##  Compiler: f77 , aka g77
+##
+
+F77 = ${FC}
+LIBS =
+F77FLAGS = -Wno-globals -fno-globals -c -w
+LINKFLAGS =
+
+OPTFLAGS = ${FFLAGS} -ffast-math
+.if ${MACHINE_ARCH} == "i386"
+OPTFLAGS += -malign-double
+.endif
+LIBFLAGS = -rcuv
+
 #################################################################
 ##  Should not be Necessary to Change Things Below this Point  ##
 #################################################################
@@ -497,11 +515,13 @@
            xyzpdb.x \
            xyzsybyl.x
 
+.SUFFIXES: .x
+
 .f.o:
 	${F77} ${F77FLAGS} ${OPTFLAGS} $*.f 
 
-%.x: %.o libtinker.a
-	${F77} ${LINKFLAGS} -o $@ $^ ${LIBS}
+.o.x: libtinker.a
+	${F77} ${LINKFLAGS} -o $@ $< libtinker.a ${LIBS}
 
 all:	${EXEFILES}
 
@@ -512,58 +532,58 @@
 	cat *.i *.f > tinker.txt
 
 rename:
-	mv  alchemy.x    $(BINDIR)/alchemy
-	mv  analyze.x    $(BINDIR)/analyze
-	mv  anneal.x     $(BINDIR)/anneal
-	mv  archive.x    $(BINDIR)/archive
-	mv  correlate.x  $(BINDIR)/correlate
-	mv  crystal.x    $(BINDIR)/crystal
-	mv  diffuse.x    $(BINDIR)/diffuse
-	mv  distgeom.x   $(BINDIR)/distgeom
-	mv  document.x   $(BINDIR)/document
-	mv  dynamic.x    $(BINDIR)/dynamic
-	mv  gda.x        $(BINDIR)/gda
-	mv  intedit.x    $(BINDIR)/intedit
-	mv  intxyz.x     $(BINDIR)/intxyz
-	mv  minimize.x   $(BINDIR)/minimize
-	mv  minirot.x    $(BINDIR)/minirot
-	mv  minrigid.x   $(BINDIR)/minrigid
-	mv  monte.x      $(BINDIR)/monte
-	mv  newton.x     $(BINDIR)/newton
-	mv  newtrot.x    $(BINDIR)/newtrot
-	mv  nucleic.x    $(BINDIR)/nucleic
-	mv  optimize.x   $(BINDIR)/optimize
-	mv  optirot.x    $(BINDIR)/optirot
-	mv  optrigid.x   $(BINDIR)/optrigid
-	mv  path.x       $(BINDIR)/path
-	mv  pdbxyz.x     $(BINDIR)/pdbxyz
-	mv  polarize.x   $(BINDIR)/polarize
-	mv  protein.x    $(BINDIR)/protein
-	mv  pss.x        $(BINDIR)/pss
-	mv  pssrigid.x   $(BINDIR)/pssrigid
-	mv  pssrot.x     $(BINDIR)/pssrot
-	mv  radial.x     $(BINDIR)/radial
-	mv  saddle.x     $(BINDIR)/saddle
-	mv  scan.x       $(BINDIR)/scan
-	mv  sniffer.x    $(BINDIR)/sniffer
-	mv  spacefill.x  $(BINDIR)/spacefill
-	mv  spectrum.x   $(BINDIR)/spectrum
-	mv  superpose.x  $(BINDIR)/superpose
-	mv  sybylxyz.x   $(BINDIR)/sybylxyz
-	mv  testgrad.x   $(BINDIR)/testgrad
-	mv  testhess.x   $(BINDIR)/testhess
-	mv  testlight.x  $(BINDIR)/testlight
-	mv  testrot.x    $(BINDIR)/testrot
-	mv  timer.x      $(BINDIR)/timer
-	mv  timerot.x    $(BINDIR)/timerot
-	mv  vibrate.x    $(BINDIR)/vibrate
-	mv  vibrot.x     $(BINDIR)/vibrot
-	mv  xtalfit.x    $(BINDIR)/xtalfit
-	mv  xtalmin.x    $(BINDIR)/xtalmin
-	mv  xyzedit.x    $(BINDIR)/xyzedit
-	mv  xyzint.x     $(BINDIR)/xyzint
-	mv  xyzpdb.x     $(BINDIR)/xyzpdb
-	mv  xyzsybyl.x   $(BINDIR)/xyzsybyl
+	${INSTALL_PROGRAM}  alchemy.x    $(BINDIR)/alchemy
+	${INSTALL_PROGRAM}  analyze.x    $(BINDIR)/analyze
+	${INSTALL_PROGRAM}  anneal.x     $(BINDIR)/anneal
+	${INSTALL_PROGRAM}  archive.x    $(BINDIR)/archive
+	${INSTALL_PROGRAM}  correlate.x  $(BINDIR)/correlate
+	${INSTALL_PROGRAM}  crystal.x    $(BINDIR)/crystal
+	${INSTALL_PROGRAM}  diffuse.x    $(BINDIR)/diffuse
+	${INSTALL_PROGRAM}  distgeom.x   $(BINDIR)/distgeom
+	${INSTALL_PROGRAM}  document.x   $(BINDIR)/document
+	${INSTALL_PROGRAM}  dynamic.x    $(BINDIR)/dynamic
+	${INSTALL_PROGRAM}  gda.x        $(BINDIR)/gda
+	${INSTALL_PROGRAM}  intedit.x    $(BINDIR)/intedit
+	${INSTALL_PROGRAM}  intxyz.x     $(BINDIR)/intxyz
+	${INSTALL_PROGRAM}  minimize.x   $(BINDIR)/minimize
+	${INSTALL_PROGRAM}  minirot.x    $(BINDIR)/minirot
+	${INSTALL_PROGRAM}  minrigid.x   $(BINDIR)/minrigid
+	${INSTALL_PROGRAM}  monte.x      $(BINDIR)/monte
+	${INSTALL_PROGRAM}  newton.x     $(BINDIR)/newton
+	${INSTALL_PROGRAM}  newtrot.x    $(BINDIR)/newtrot
+	${INSTALL_PROGRAM}  nucleic.x    $(BINDIR)/nucleic
+	${INSTALL_PROGRAM}  optimize.x   $(BINDIR)/optimize
+	${INSTALL_PROGRAM}  optirot.x    $(BINDIR)/optirot
+	${INSTALL_PROGRAM}  optrigid.x   $(BINDIR)/optrigid
+	${INSTALL_PROGRAM}  path.x       $(BINDIR)/path
+	${INSTALL_PROGRAM}  pdbxyz.x     $(BINDIR)/pdbxyz
+	${INSTALL_PROGRAM}  polarize.x   $(BINDIR)/polarize
+	${INSTALL_PROGRAM}  protein.x    $(BINDIR)/protein
+	${INSTALL_PROGRAM}  pss.x        $(BINDIR)/pss
+	${INSTALL_PROGRAM}  pssrigid.x   $(BINDIR)/pssrigid
+	${INSTALL_PROGRAM}  pssrot.x     $(BINDIR)/pssrot
+	${INSTALL_PROGRAM}  radial.x     $(BINDIR)/radial
+	${INSTALL_PROGRAM}  saddle.x     $(BINDIR)/saddle
+	${INSTALL_PROGRAM}  scan.x       $(BINDIR)/scan
+	${INSTALL_PROGRAM}  sniffer.x    $(BINDIR)/sniffer
+	${INSTALL_PROGRAM}  spacefill.x  $(BINDIR)/spacefill
+	${INSTALL_PROGRAM}  spectrum.x   $(BINDIR)/spectrum
+	${INSTALL_PROGRAM}  superpose.x  $(BINDIR)/superpose
+	${INSTALL_PROGRAM}  sybylxyz.x   $(BINDIR)/sybylxyz
+	${INSTALL_PROGRAM}  testgrad.x   $(BINDIR)/testgrad
+	${INSTALL_PROGRAM}  testhess.x   $(BINDIR)/testhess
+	${INSTALL_PROGRAM}  testlight.x  $(BINDIR)/testlight
+	${INSTALL_PROGRAM}  testrot.x    $(BINDIR)/testrot
+	${INSTALL_PROGRAM}  timer.x      $(BINDIR)/timer
+	${INSTALL_PROGRAM}  timerot.x    $(BINDIR)/timerot
+	${INSTALL_PROGRAM}  vibrate.x    $(BINDIR)/vibrate
+	${INSTALL_PROGRAM}  vibrot.x     $(BINDIR)/vibrot
+	${INSTALL_PROGRAM}  xtalfit.x    $(BINDIR)/xtalfit
+	${INSTALL_PROGRAM}  xtalmin.x    $(BINDIR)/xtalmin
+	${INSTALL_PROGRAM}  xyzedit.x    $(BINDIR)/xyzedit
+	${INSTALL_PROGRAM}  xyzint.x     $(BINDIR)/xyzint
+	${INSTALL_PROGRAM}  xyzpdb.x     $(BINDIR)/xyzpdb
+	${INSTALL_PROGRAM}  xyzsybyl.x   $(BINDIR)/xyzsybyl
 
 remove_links:
 	rm -f $(LINKDIR)/alchemy