diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-09-17 13:02:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-09-17 13:02:52 +0000 |
| commit | 335248c9b7cf590f03c67aa0cadfcf95627fedd5 (patch) | |
| tree | 4bdb05df045f4334c270b5f1cb18b84b3d48b20c /src/pl | |
| parent | e930a9a97b46113a8932feb8555a3df362056080 (diff) | |
Support for DESTDIR make variable. This is used as in `make install
DESTDIR=/else/where' and prepends the value of DESTDIR to the full
installation paths (e.g., /else/where/usr/local/pgsql/bin). This allows
users to install the package into a location different from the one that
was configured and hard-coded into various scripts, e.g., for creating
binary packages.
DESTDIR is in many cases preferrable over `make install
prefix=/else/where' because
a) `prefix' affects the path that is hard-coded into the files, which can
lead to a `make install prefix=xxx' (as done by the regression test
driver) corrupting the files in the source tree with wrong paths.
b) it doesn't work at all if a directory was overridden to not depend on
`prefix', e.g., --sysconfdir=/etc.
(Updating the regression test driver to use DESTDIR is a separate
undertaking.)
See also autoconf@gnu.org, From: Akim Demaille <akim@epita.fr>, Date: 08
Sep 2000 12:48:59 +0200, Message-ID:
<mv4em2vb1lw.fsf@nostromo.lrde.epita.fr>, Subject: Re: HTML format
documentation.
Diffstat (limited to 'src/pl')
| -rw-r--r-- | src/pl/plperl/GNUmakefile | 10 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/Makefile | 8 | ||||
| -rw-r--r-- | src/pl/tcl/Makefile | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index a04eb8ba9f4..4ccd7fde99d 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -1,10 +1,10 @@ -# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.3 2000/08/31 16:12:13 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.4 2000/09/17 13:02:51 petere Exp $ subdir = src/pl/plperl top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -plperl_installdir = $(libdir) +plperl_installdir = $(DESTDIR)$(libdir) all: Makefile @@ -16,13 +16,13 @@ Makefile: Makefile.PL $(PERL) $< POLLUTE=1 install: all installdirs - $(MAKE) -f $< install + $(MAKE) -f Makefile install installdirs: - $(mkinstalldirs) $(plperl_installdir) + $(mkinstalldirs) $(DESTDIR)$(plperl_installdir) uninstall: - rm -f $(libdir)/plperl$(DLSUFFIX) + rm -f $(DESTDIR)$(libdir)/plperl$(DLSUFFIX) clean distclean maintainer-clean: -[ -f Makefile ] && $(MAKE) -f Makefile clean diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile index 17780551b00..015f4a8ec4e 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -2,7 +2,7 @@ # # Makefile for the plpgsql shared object # -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.6 2000/08/28 11:53:23 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.7 2000/09/17 13:02:52 petere Exp $ # #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ include $(top_srcdir)/src/Makefile.shlib install: installdirs all ifdef shlib - $(INSTALL_SHLIB) $(shlib) $(libdir)/plpgsql$(DLSUFFIX) + $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(libdir)/plpgsql$(DLSUFFIX) else @echo "*****"; \ echo "* PL/pgSQL was not installed due to lack of shared library support."; \ @@ -41,10 +41,10 @@ else endif installdirs: - $(mkinstalldirs) $(libdir) + $(mkinstalldirs) $(DESTDIR)$(libdir) uninstall: - rm -f $(libdir)/plpgsql$(DLSUFFIX) + rm -f $(DESTDIR)$(libdir)/plpgsql$(DLSUFFIX) pl_handler.o pl_comp.o pl_exec.o pl_funcs.o: plpgsql.h $(srcdir)/pl.tab.h diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index c8f1ad5b8bc..010367c23a5 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.22 2000/08/31 16:12:17 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.23 2000/09/17 13:02:52 petere Exp $ # #------------------------------------------------------------------------- @@ -98,13 +98,13 @@ ifeq ($(TCL_SHARED_BUILD), 1) all: $(INFILES) install: all installdirs - $(INSTALL_SHLIB) $(DLOBJS) $(libdir)/$(DLOBJS) + $(INSTALL_SHLIB) $(DLOBJS) $(DESTDIR)$(libdir)/$(DLOBJS) installdirs: - $(mkinstalldirs) $(libdir) + $(mkinstalldirs) $(DESTDIR)$(libdir) uninstall: - rm -f $(libdir)/$(DLOBJS) + rm -f $(DESTDIR)$(libdir)/$(DLOBJS) else |
