[patch] The directory-variable patch.

libpq++-dirvars.patch (text/plain), 1.80 KB, created by Mathias Hasselmann on 2003-11-09 15:48:06 UTC

--- Makefile.orig	2002-11-27 05:46:08.000000000 +0100
+++ Makefile	2003-11-09 23:21:59.000000000 +0100
@@ -12,6 +12,8 @@
 SO_MINOR_VERSION= 0
 
 POSTGRES_HOME=/usr/local/pgsql
+POSTGRES_INCDIR=$(POSTGRES_HOME)/include
+POSTGRES_LIBDIR=$(POSTGRES_HOME)/lib
 CXXOPTS= -DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT=""
 
 TARGET= libpq++
@@ -20,24 +22,24 @@
 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,$(POSTGRES_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$(POSTGRES_LIBDIR) -l$(LIBS) $(SHARED) -o $(soname)
 
 %.o	: %.cc
-	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(POSTGRES_HOME)/include $<
+	$(CXX) -c $(CXXFLAGS) $(CXXOPTS) -I$(POSTGRES_INCDIR) $<
 
 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
+	install $(soname) $(POSTGRES_LIBDIR)
+	rm -f $(POSTGRES_LIBDIR)/$(TARGET).so
+	ln -s $(POSTGRES_LIBDIR)/$(soname) $(POSTGRES_LIBDIR)/$(TARGET).so
+	install -c $(TARGET).h $(POSTGRES_INCDIR)
+	-mkdir $(POSTGRES_INCDIR)/libpq++
+	for i in $(LIBPGXXHEADERS); do install -c $$i $(POSTGRES_INCDIR)/libpq++ || exit 1; done