diff -Naur nspostgres-4.0/Makefile nspostgres-jim1+4.0/Makefile
--- nspostgres-4.0/Makefile	2003-10-02 06:02:21.000000000 -0700
+++ nspostgres-jim1+4.0/Makefile	2005-09-21 18:50:34.000000000 -0700
@@ -54,8 +54,16 @@
     PGLIB = /usr/lib
     PGINC = /usr/include
 else
-    PGLIB = $(POSTGRES)/lib
-    PGINC = $(POSTGRES)/include
+    ifeq ($(POSTGRES),PG_CONFIG)
+        PGLIB = $(shell pg_config --libs)
+        PGINC = $(shell pg_config --includedir)
+    else
+        ifneq ($(POSTGRES),SEPARATELY)
+            PGLIB = $(POSTGRES)/lib
+            PGINC = $(POSTGRES)/include
+        endif
+        # otherwise, it is assumed PGINC and PGLIB set on commandline
+    endif
 endif
  
 #
@@ -148,9 +156,16 @@
 	    echo "** "; \
 	    echo "** Usage: make POSTGRES=/path/to/postgresql"; \
 	    echo "**        make POSTGRES=LSB"; \
+	    echo "**        make POSTGRES=PG_CONFIG"; \
+	    echo "**        make POSTGRES=SEPARATELY PGLIB=/path/to/libs PGINC=/wheres/the/includes" \
 	    echo "** "; \
 	    echo "** Usage: make install POSTGRES=/path/to/postgresql INST=/path/to/aolserver"; \
 	    echo "**        make install POSTGRES=LSB INST=/path/to/aolserver"; \
+	    echo "**        make install POSTGRES=PG_CONFIG"; \
+	    echo "**        make install POSTGRES=SEPARATELY \\"; \
+	    echo "                       PGLIB=/path/to/libs \\"; \
+	    echo "                       PGINC=/wheres/the/includes \\"; \
+	    echo "                   INST=/path/to/aolserver"; \
 	    echo "** "; \
 	    echo "** OpenACS users should also set ACS=1"; \
 	    echo "** "; \