--- Makefile.orig	2005-04-13 12:57:52.000000000 -0700
+++ Makefile	2005-04-13 13:01:02.000000000 -0700
@@ -11,33 +11,37 @@
 SO_MAJOR_VERSION= 4
 SO_MINOR_VERSION= 0
 
-POSTGRES_HOME=/usr/local/pgsql
+PREFIX=/usr
+LIBDIR=lib
+DESTDIR=
+
 CXXOPTS= -DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT=""
 
 TARGET= libpq++
-CFLAGS= -O -Wall
+CXXFLAGS= -O -Wall
 LIBS=pq
 OBJS= pgconnection.o pgdatabase.o pgtransdb.o pgcursordb.o pglobject.o
 LIBPGXXHEADERS = pgconnection.h pgdatabase.h pgtransdb.h pgcursordb.h pglobject.h
 
-SHARED= -fpic -shared -Wl,-x,-soname,$(TARGET).so.$(SO_MAJOR_VERSION) -Wl,-rpath,$(POSTGRES_HOME)/lib
+SHARED= -fPIC -shared -Wl,-x,-soname,$(TARGET).so.$(SO_MAJOR_VERSION) -Wl,-rpath,$(PREFIX)/$(LIBDIR)
 soname=$(TARGET).so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
 
 all:  $(soname)
 
 $(soname) : $(OBJS)
-	$(CXX) $(CXXFLAGS) $(OBJS) -L$(POSTGRES_HOME)/lib -l$(LIBS) $(SHARED) -o $(soname)
+	$(CXX) $(CXXFLAGS) $(OBJS) -L$(PREFIX)/$(LIBDIR) -l$(LIBS) $(SHARED) -o $(soname)
 
 %.o	: %.cc
-	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(POSTGRES_HOME)/include $<
+	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(PREFIX)/include $< -fPIC -DPIC
 
 clean:
 	rm -f $(OBJS) $(soname)
 
 install:
-	install $(soname) $(POSTGRES_HOME)/lib
-	rm -f $(POSTGRES_HOME)/lib/$(TARGET).so
-	ln -s $(POSTGRES_HOME)/lib/$(soname) $(POSTGRES_HOME)/lib/$(TARGET).so
-	install -c $(TARGET).h $(POSTGRES_HOME)/include
-	-mkdir $(POSTGRES_HOME)/include/libpq++
-	for i in $(LIBPGXXHEADERS); do install -c $$i $(POSTGRES_HOME)/include/libpq++ || exit 1; done
+	-mkdir -p $(DESTDIR)$(PREFIX)/include/libpq++
+	-mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR)
+	install $(soname) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+	rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(TARGET).so
+	ln -s $(soname) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(TARGET).so
+	install -c $(TARGET).h $(DESTDIR)$(PREFIX)/include
+	for i in $(LIBPGXXHEADERS); do install -c $$i $(DESTDIR)$(PREFIX)/include/libpq++ || exit 1; done