--- pgsql/Makefile	2007-06-02 12:34:19.000000000 -0500
+++ pgsql/Makefile.new	2007-06-02 12:38:31.000000000 -0500
@@ -23,7 +23,11 @@
 SO_MAJOR_VERSION  = 1
 SO_MINOR_VERSION  = 0
 
-override CPPFLAGS := -I.. $(CPPFLAGS)
+override CPPFLAGS := -I.. \
+                     -I$(shell $(PG_CONFIG) --includedir) \
+                     -I$(shell $(PG_CONFIG) --includedir-server) \
+                     -L$(shell $(PG_CONFIG) --libdir) \
+                     $(CPPFLAGS)
 SHLIB_LINK        := -L../.libs -luuid
 SHLIB_LINK        += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
 SHLIB_LINK        += $(shell test $(shell uname -s) = Darwin && echo "-bundle_loader $(POSTGRES)")