--- makefile--	Mon May 14 06:41:27 2001
+++ makefile	Mon Sep  3 15:37:38 2001
@@ -32,21 +32,22 @@
 # - Added a commented-out block showing settings for Debian/GNU Linux with
 #   package installed AOLserver and PostgreSQL
 
-INSTALL=/home/nsadmin
+INSTALL=${NSHOME}
 
 # Location of the PostgreSQL libraries
-PGLIB=/usr/local/pgsql/lib
+PGLIB=${PREFIX}/lib
 
 # Location of the PostgreSQL includes
-PGINC=/usr/local/pgsql/include
+PGINC=${PREFIX}/include
 
 # Location of the AOLserver files (normally the ~nsadmin directory):
 #NSHOME=/opt/aolserver
 # Alternate location for AOLserver
-NSHOME=/home/aolserver/aolserver3_0
+NSHOME=${PREFIX}/aolserver
 
 CC=gcc
-COPTS=-Wall -fpic -shared -I/usr/local/pgsql/include -I/home/aolserver/include -I-/usr/include
+COPTS=-Wall -fpic -shared -I${PGINC} -I${NSNOME}/include -I-/usr/include
+LDFLAGS=-pthread -Wl,-E
 
 # Debian Linux with deb AOLserver & PostgreSQL
 #CC=gcc