Make DESTDIR consistent, and verious Linux cleanups.

1 files changed, 36 insertions, 36 deletions

diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 2598ee5cd27..0a4005624b3 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.12 1998/04/06 01:16:43 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.13 1998/04/06 01:35:53 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -35,7 +35,7 @@ ifeq ($(PORTNAME), linux)
   ifdef LINUX_ELF
     install-shlib-dep := install-shlib
     shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-    LDFLAGS_SL = -shared
+    LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
     CFLAGS += $(CFLAGS_SL)
   endif
 endif
@@ -117,57 +117,57 @@ install-headers: beforeinstall-headers c.h \
                  $(SRCDIR)/include/libpq/libpq-fs.h $(SRCDIR)/include/lib/dllist.h \
                  $(SRCDIR)/include/utils/geo_decls.h libpq-fe.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
-          $(HEADERDIR)/os.h
+          $(DESTDIR)$(HEADERDIR)/os.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
-          $(HEADERDIR)/config.h
+          $(DESTDIR)$(HEADERDIR)/config.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
-          $(HEADERDIR)/postgres.h
+          $(DESTDIR)$(HEADERDIR)/postgres.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
-          $(HEADERDIR)/postgres_ext.h
+          $(DESTDIR)$(HEADERDIR)/postgres_ext.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
-          $(HEADERDIR)/libpq/pqcomm.h
+          $(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
-          $(HEADERDIR)/libpq/libpq-fs.h
+          $(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
-          $(HEADERDIR)/lib/dllist.h
+          $(DESTDIR)$(HEADERDIR)/lib/dllist.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
-          $(HEADERDIR)/utils/geo_decls.h
+          $(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
-          $(HEADERDIR)/utils/elog.h
+          $(DESTDIR)$(HEADERDIR)/utils/elog.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
-          $(HEADERDIR)/utils/palloc.h
+          $(DESTDIR)$(HEADERDIR)/utils/palloc.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
-          $(HEADERDIR)/access/attnum.h
+          $(DESTDIR)$(HEADERDIR)/access/attnum.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
-          $(HEADERDIR)/executor/spi.h
+          $(DESTDIR)$(HEADERDIR)/executor/spi.h
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
-          $(HEADERDIR)/commands/trigger.h
-	$(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
+          $(DESTDIR)$(HEADERDIR)/commands/trigger.h
+	$(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
 ifeq ($(PORTNAME), hpux)
 	$(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
-          $(HEADERDIR)/port/hpux/fixade.h
+          $(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
 endif
-	$(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h
+	$(INSTALL) $(INSTLOPTS) c.h $(DESTDIR)$(HEADERDIR)/c.h
 
 beforeinstall-headers:
-	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
-	@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
-	@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
-		then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
-	@if [ ! -d $(HEADERDIR)/include ]; \
-		then mkdir $(HEADERDIR)/include; fi
-	@if [ ! -d $(HEADERDIR)/lib ]; \
-		then mkdir $(HEADERDIR)/lib; fi
-	@if [ ! -d $(HEADERDIR)/libpq ]; \
-		then mkdir $(HEADERDIR)/libpq; fi
-	@if [ ! -d $(HEADERDIR)/utils ]; \
-		then mkdir $(HEADERDIR)/utils; fi
-	@if [ ! -d $(HEADERDIR)/access ]; \
-		then mkdir $(HEADERDIR)/access; fi
-	@if [ ! -d $(HEADERDIR)/executor ]; \
-		then mkdir $(HEADERDIR)/executor; fi
-	@if [ ! -d $(HEADERDIR)/commands ]; \
-		then mkdir $(HEADERDIR)/commands; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/port ]; then mkdir $(DESTDIR)$(HEADERDIR)/port; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME) ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME); fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/include ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/include; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/lib ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/lib; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/libpq ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/libpq; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/utils ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/utils; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/access ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/access; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/executor ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/executor; fi
+	@if [ ! -d $(DESTDIR)$(HEADERDIR)/commands ]; \
+		then mkdir $(DESTDIR)$(HEADERDIR)/commands; fi
 
 install-libpq: libpq.a
 	$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a