diff options
| author | Bruce Momjian | 1998-04-06 01:36:41 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-04-06 01:36:41 +0000 |
| commit | 066ee9a2e98d5587a3a9bb71711f900e1f5d161e (patch) | |
| tree | f830e9f83eacdc81cfbdef642fcf2ce9fc2c213f /src/interfaces/libpq++ | |
| parent | 5523beb949241d9ed498aa51eb6c91f7100e7e46 (diff) | |
Make DESTDIR consistent, and verious Linux cleanups.
Diffstat (limited to 'src/interfaces/libpq++')
| -rw-r--r-- | src/interfaces/libpq++/Makefile | 20 | ||||
| -rw-r--r-- | src/interfaces/libpq++/man/Makefile | 9 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile index 9b9081e3f1e..3c7d03c8a0c 100644 --- a/src/interfaces/libpq++/Makefile +++ b/src/interfaces/libpq++/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.13 1998/04/06 01:16:47 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.14 1998/04/06 01:36:07 momjian Exp $ # #------------------------------------------------------------------------- @@ -45,7 +45,13 @@ INSTALL-SHLIB-DEP := ifeq ($(PORTNAME), i386_solaris) INSTALL-SHLIB-DEP := install-shlib SHLIB := libpq++.so.1 - LDFLAGS_SL = -G -z text + LDFLAGS_SL = -G -z text -shared -soname $(SHLIB) + CFLAGS += $(CFLAGS_SL) +endif +ifeq ($(PORTNAME), linux) + INSTALL-SHLIB-DEP := install-shlib + SHLIB := libpq++.so.1 + LDFLAGS_SL = -shared -soname $(SHLIB) CFLAGS += $(CFLAGS_SL) endif ifeq ($(PORTNAME), hpux) @@ -55,7 +61,7 @@ ifeq ($(PORTNAME), hpux) CFLAGS += $(CFLAGS_SL) endif -all: $(LIBNAME).a $(SHLIB) install examples +all: $(LIBNAME).a $(SHLIB) $(LIBNAME).a: $(OBJS) ifdef MK_NO_LORDER @@ -88,15 +94,15 @@ LIBPGXXHEADERS = pgenv.h \ pglobject.h install-headers: beforeinstall-headers $(MAINHEADER) - @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER) + @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(DESTDIR)/$(HEADERDIR)/$(MAINHEADER) @for i in ${LIBPGXXHEADERS}; do \ echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \ - $(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \ + $(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)/$(LIBPGXXHEADERDIR)/$$i; \ done beforeinstall-headers: - @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi - @if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi + @if [ ! -d $(DESTDIR)/$(HEADERDIR) ]; then mkdir $(DESTDIR)/$(HEADERDIR); fi + @if [ ! -d $(DESTDIR)/$(LIBPGXXHEADERDIR) ]; then mkdir $(DESTDIR)/$(LIBPGXXHEADERDIR); fi beforeinstall-lib: @if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir $(DESTDIR)/$(LIBDIR); fi diff --git a/src/interfaces/libpq++/man/Makefile b/src/interfaces/libpq++/man/Makefile index fd4ce5559fc..bce4e0af3ed 100644 --- a/src/interfaces/libpq++/man/Makefile +++ b/src/interfaces/libpq++/man/Makefile @@ -4,7 +4,7 @@ # Makefile for doc directory to install man pages # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.3 1997/09/16 18:47:36 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.4 1998/04/06 01:36:20 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,7 +12,6 @@ SRCDIR= ../../.. include ../../../Makefile.global install: - -mkdir -p $(POSTMANDIR) - -mkdir $(POSTMANDIR)/man3 - cp *.3* $(POSTMANDIR)/man3 - + -mkdir $(DESTDIR)$(POSTMANDIR) + -mkdir $(DESTDIR)$(POSTMANDIR)/man3 + cp *.3* $(DESTDIR)$(POSTMANDIR)/man3 |