diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 21 | ||||
| -rw-r--r-- | src/Makefile.shlib | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 361ff04d2ff..f7feda8366c 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.144 2002/03/29 17:32:54 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.145 2002/04/10 16:45:25 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -18,7 +18,7 @@ # # Meta configuration -.PHONY: all install installdirs uninstall clean distclean maintainer-clean distprep check installcheck maintainer-check +.PHONY: all install install-strip installdirs uninstall clean distclean maintainer-clean distprep check installcheck maintainer-check .SILENT: installdirs # make `all' the default target @@ -228,16 +228,21 @@ BZIP2 = bzip2 INSTALL = $(SHELL) $(top_srcdir)/config/install-sh -c -INSTALL_PROGRAM = $(INSTALL) +INSTALL_PROGRAM = $(INSTALL_PROGRAM_ENV) $(INSTALL) $(INSTALL_STRIP_FLAG) INSTALL_SCRIPT = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_SHLIB = $(INSTALL) $(INSTALL_SHLIB_OPTS) +INSTALL_STLIB = $(INSTALL_STLIB_ENV) $(INSTALL_DATA) $(INSTALL_STRIP_FLAG) +INSTALL_SHLIB = $(INSTALL_SHLIB_ENV) $(INSTALL) $(INSTALL_SHLIB_OPTS) $(INSTALL_STRIP_FLAG) # Override in Makefile.port if necessary INSTALL_SHLIB_OPTS = -m 755 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs missing = $(SHELL) $(top_srcdir)/config/missing +STRIP = @STRIP@ +STRIP_STATIC_LIB = @STRIP_STATIC_LIB@ +STRIP_SHARED_LIB = @STRIP_SHARED_LIB@ + # Documentation JADE = @JADE@ @@ -384,6 +389,14 @@ $(top_builddir)/config.status: $(top_srcdir)/configure cd $(top_builddir) && ./config.status --recheck +install-strip: + @$(MAKE) INSTALL_PROGRAM_ENV="STRIPPROG='$(STRIP)'" \ + INSTALL_STLIB_ENV="STRIPPROG='$(STRIP_STATIC_LIB)'" \ + INSTALL_SHLIB_ENV="STRIPPROG='$(STRIP_SHARED_LIB)'" \ + INSTALL_STRIP_FLAG=-s \ + install + + ########################################################################## # # Automatic dependency generation diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 2496ad99147..9a4ee4b50ef 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.56 2001/11/11 19:20:53 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.57 2002/04/10 16:45:25 petere Exp $ # #------------------------------------------------------------------------- @@ -357,7 +357,7 @@ endif # enable_shared install-lib: install-lib-static install-lib-shared install-lib-static: lib$(NAME).a - $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/lib$(NAME).a + $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a ifeq ($(enable_shared), yes) install-lib-shared: $(shlib) |