diff options
| author | Bruce Momjian | 1998-04-06 16:53:15 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-04-06 16:53:15 +0000 |
| commit | 471dbbc2238701a0191cd3dca1388f4b0a5641e7 (patch) | |
| tree | 429c3c81b370ee6a87a9854314838541f214d1b7 /src/interfaces/libpq++ | |
| parent | 0bf814117227906fc089011420add221f69be5c2 (diff) | |
DESTDIR removed, again.
Diffstat (limited to 'src/interfaces/libpq++')
| -rw-r--r-- | src/interfaces/libpq++/Makefile | 20 | ||||
| -rw-r--r-- | src/interfaces/libpq++/man/Makefile | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile index 6ed1715f8b0..5b1d5cfbc5d 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.15 1998/04/06 04:57:32 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.16 1998/04/06 16:52:36 momjian Exp $ # #------------------------------------------------------------------------- @@ -94,26 +94,26 @@ LIBPGXXHEADERS = pgenv.h \ pglobject.h install-headers: beforeinstall-headers $(MAINHEADER) - @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(DESTDIR)$(HEADERDIR)/$(MAINHEADER) + @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER) @for i in ${LIBPGXXHEADERS}; do \ echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \ - $(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)$(LIBPGXXHEADERDIR)/$$i; \ + $(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \ done beforeinstall-headers: - @if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi - @if [ ! -d $(DESTDIR)$(LIBPGXXHEADERDIR) ]; then mkdir $(DESTDIR)$(LIBPGXXHEADERDIR); fi + @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi + @if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi beforeinstall-lib: - @if [ ! -d $(DESTDIR)$(LIBDIR) ] ; then mkdir $(DESTDIR)$(LIBDIR); fi + @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR); fi install-$(LIBNAME): $(LIBNAME).a beforeinstall-lib - $(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(DESTDIR)$(LIBDIR)/$(LIBNAME).a + $(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(LIBDIR)/$(LIBNAME).a install-shlib: $(SHLIBNAME) beforeinstall-lib - $(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(DESTDIR)$(LIBDIR)/$(SHLIB) - rm -f $(DESTDIR)$(LIBDIR)/libpq++.so - ln -sf $(SHLIB) $(DESTDIR)$(LIBDIR)/libpq++.so + $(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(LIBDIR)/$(SHLIB) + rm -f $(LIBDIR)/libpq++.so + ln -sf $(SHLIB) $(LIBDIR)/libpq++.so doc: diff --git a/src/interfaces/libpq++/man/Makefile b/src/interfaces/libpq++/man/Makefile index bce4e0af3ed..ab8752021a7 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.4 1998/04/06 01:36:20 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.5 1998/04/06 16:52:47 momjian Exp $ # #------------------------------------------------------------------------- @@ -12,6 +12,6 @@ SRCDIR= ../../.. include ../../../Makefile.global install: - -mkdir $(DESTDIR)$(POSTMANDIR) - -mkdir $(DESTDIR)$(POSTMANDIR)/man3 - cp *.3* $(DESTDIR)$(POSTMANDIR)/man3 + -mkdir $(POSTMANDIR) + -mkdir $(POSTMANDIR)/man3 + cp *.3* $(POSTMANDIR)/man3 |