diff options
| author | Peter Eisentraut | 2009-08-26 22:24:44 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2009-08-26 22:24:44 +0000 |
| commit | 9d182ef002b15c873074c710b709149450ddbcd9 (patch) | |
| tree | 76bacc6e91c2ea2328c60972f361c8735a06ca77 /src | |
| parent | 7ca774a8739bc3887abda2a0259703729026a5ca (diff) | |
Update of install-sh, mkinstalldirs, and associated configury
Update install-sh to that from Autoconf 2.63, plus our Darwin-specific
changes (which I simplified a bit). install-sh is now able to install
multiple files in one run, so we could simplify our makefiles sometime.
install-sh also now has a -d option to create directories, so we don't need
mkinstalldirs anymore.
Use AC_PROG_MKDIR_P in configure.in, so we can use mkdir -p when available
instead of install-sh -d. For consistency with the rest of the world,
the corresponding make variable has been renamed from $(mkinstalldirs) to
$(MKDIR_P).
Diffstat (limited to 'src')
28 files changed, 67 insertions, 67 deletions
diff --git a/src/Makefile b/src/Makefile index 8c869573bf6..966cb946879 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/Makefile,v 1.46 2009/08/07 20:50:22 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile,v 1.47 2009/08/26 22:24:42 petere Exp $ # #------------------------------------------------------------------------- @@ -37,7 +37,7 @@ install-local: installdirs-local installdirs: installdirs-local installdirs-local: - $(mkinstalldirs) '$(DESTDIR)$(pgxsdir)/$(subdir)' + $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)' uninstall: uninstall-local diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 5141e7dfdd4..c781e22f48f 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.257 2009/08/09 22:47:59 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.258 2009/08/26 22:24:42 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -19,7 +19,6 @@ # Meta configuration .PHONY: all install install-strip installdirs uninstall clean distclean maintainer-clean distprep check installcheck maintainer-check coverage html man -.SILENT: installdirs # make `all' the default target all: @@ -284,7 +283,8 @@ INSTALL_SHLIB = $(INSTALL_SHLIB_ENV) $(INSTALL) $(INSTALL_SHLIB_OPTS) $(INSTALL_ # Override in Makefile.port if necessary INSTALL_SHLIB_OPTS = -m 755 -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +MKDIR_P = @MKDIR_P@ + missing = $(SHELL) $(top_srcdir)/config/missing STRIP = @STRIP@ diff --git a/src/Makefile.shlib b/src/Makefile.shlib index b4f46da00ac..748e6bb77d8 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.120 2009/01/05 09:27:19 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.121 2009/08/26 22:24:42 petere Exp $ # #------------------------------------------------------------------------- @@ -517,9 +517,9 @@ endif # enable_shared installdirs-lib: ifdef soname - $(mkinstalldirs) '$(DESTDIR)$(libdir)' + $(MKDIR_P) '$(DESTDIR)$(libdir)' else - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' endif diff --git a/src/backend/Makefile b/src/backend/Makefile index 86526d5f1af..5ee3c4193dc 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/Makefile,v 1.132 2009/01/01 17:23:34 momjian Exp $ +# $PostgreSQL: pgsql/src/backend/Makefile,v 1.133 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -194,19 +194,19 @@ endif .PHONY: install-bin installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' '$(DESTDIR)$(datadir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' '$(DESTDIR)$(datadir)' ifeq ($(PORTNAME), cygwin) ifeq ($(MAKE_DLL), true) - $(mkinstalldirs) '$(DESTDIR)$(libdir)' + $(MKDIR_P) '$(DESTDIR)$(libdir)' endif endif ifeq ($(PORTNAME), win32) ifeq ($(MAKE_DLL), true) - $(mkinstalldirs) '$(DESTDIR)$(libdir)' + $(MKDIR_P) '$(DESTDIR)$(libdir)' endif endif ifeq ($(MAKE_EXPORTS), true) - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' endif diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index ed060488947..e4414ed2bf5 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for backend/catalog # -# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.70 2009/05/12 00:56:05 tgl Exp $ +# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.71 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -60,7 +60,7 @@ install-data: $(BKIFILES) installdirs $(INSTALL_DATA) $(srcdir)/sql_features.txt '$(DESTDIR)$(datadir)/sql_features.txt' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(datadir)' + $(MKDIR_P) '$(DESTDIR)$(datadir)' .PHONY: uninstall-data uninstall-data: diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index a1d22f24c68..1b3d5a5a3f6 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -2,7 +2,7 @@ # # Makefile for src/backend/snowball # -# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.6 2008/04/07 14:15:58 petere Exp $ +# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.7 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -125,7 +125,7 @@ install: all installdirs install-lib done installdirs: installdirs-lib - $(mkinstalldirs) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' + $(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' uninstall: uninstall-lib rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)' diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile index dd9ef556b28..e4643f91994 100644 --- a/src/backend/tsearch/Makefile +++ b/src/backend/tsearch/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2006-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.9 2009/01/01 17:23:48 momjian Exp $ +# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.10 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- subdir = src/backend/tsearch @@ -30,7 +30,7 @@ install-data: $(DICTFILES) installdirs done installdirs: - $(mkinstalldirs) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' + $(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)' .PHONY: uninstall-data uninstall-data: diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 17b5f715035..7bdd9f1f243 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb/conversion_procs # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.22 2009/08/07 20:50:22 petere Exp $ +# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.23 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -208,7 +208,7 @@ install: $(SQLSCRIPT) installdirs @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done installdirs: - $(mkinstalldirs) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(pkglibdir)' + $(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(pkglibdir)' uninstall: rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)' diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 24da9c045d0..636c99e2210 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.57 2009/01/01 17:23:53 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.58 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -37,7 +37,7 @@ install: all installdirs $(INSTALL_PROGRAM) initdb$(X) '$(DESTDIR)$(bindir)/initdb$(X)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/initdb$(X)' diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index e501a16659a..f824dbfb900 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.21 2009/01/01 17:23:54 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.22 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -37,7 +37,7 @@ install: all installdirs $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/pg_config$(X)' diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index b9bba2949d6..2ed0806ea75 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.18 2009/01/01 17:23:54 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.19 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -27,7 +27,7 @@ install: all installdirs $(INSTALL_PROGRAM) pg_controldata$(X) '$(DESTDIR)$(bindir)/pg_controldata$(X)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/pg_controldata$(X)' diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index 28698a6496f..24ad2275c25 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.26 2009/01/01 17:23:54 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.27 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -27,7 +27,7 @@ install: all installdirs $(INSTALL_PROGRAM) pg_ctl$(X) '$(DESTDIR)$(bindir)/pg_ctl$(X)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/pg_ctl$(X)' diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 4cc49d8f7a6..6a414229252 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.67 2009/03/07 00:13:58 alvherre Exp $ +# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.68 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -42,7 +42,7 @@ install: all installdirs $(INSTALL_PROGRAM) pg_dumpall$(X) '$(DESTDIR)$(bindir)'/pg_dumpall$(X) installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f $(addprefix '$(DESTDIR)$(bindir)'/, pg_dump$(X) pg_restore$(X) pg_dumpall$(X)) diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile index 05adda71b82..00bb737a69d 100644 --- a/src/bin/pg_resetxlog/Makefile +++ b/src/bin/pg_resetxlog/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.20 2009/01/01 17:23:54 momjian Exp $ +# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.21 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -27,7 +27,7 @@ install: all installdirs $(INSTALL_PROGRAM) pg_resetxlog$(X) '$(DESTDIR)$(bindir)/pg_resetxlog$(X)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/pg_resetxlog$(X)' diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 01049d8af24..aeeeebf649f 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.63 2009/06/23 03:46:00 tgl Exp $ +# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.64 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -57,7 +57,7 @@ install: all installdirs $(INSTALL_DATA) $(srcdir)/psqlrc.sample '$(DESTDIR)$(datadir)/psqlrc.sample' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/psql$(X)' '$(DESTDIR)$(datadir)/psqlrc.sample' diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 44cada79e58..4d2b1a1411c 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.42 2009/03/07 02:09:22 alvherre Exp $ +# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.43 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -54,7 +54,7 @@ install: all installdirs $(INSTALL_PROGRAM) reindexdb$(X) '$(DESTDIR)$(bindir)'/reindexdb$(X) installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(addsuffix $(X), $(PROGRAMS))) diff --git a/src/include/Makefile b/src/include/Makefile index 3b875f53bd7..1367a7d8f27 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -4,7 +4,7 @@ # # 'make install' installs whole contents of src/include. # -# $PostgreSQL: pgsql/src/include/Makefile,v 1.28 2009/07/20 20:38:55 alvherre Exp $ +# $PostgreSQL: pgsql/src/include/Makefile,v 1.29 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -50,8 +50,8 @@ install: all installdirs done installdirs: - $(mkinstalldirs) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq' - $(mkinstalldirs) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS)) + $(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq' + $(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS)) uninstall: diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile index 29ed1bfd80b..ca96f2dfe10 100644 --- a/src/interfaces/ecpg/include/Makefile +++ b/src/interfaces/ecpg/include/Makefile @@ -23,7 +23,7 @@ install-headers: $(ecpg_headers) $(informix_headers) $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(informix_esql_dir)' + $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(informix_esql_dir)' uninstall: rm -f $(addprefix '$(DESTDIR)$(includedir)'/, $(ecpg_headers)) diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index a11ceddbfe5..35332e38ffc 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2009, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.143 2009/07/13 01:37:05 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.144 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -66,7 +66,7 @@ install: all installdirs $(INSTALL_PROGRAM) ecpg$(X) '$(DESTDIR)$(bindir)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: rm -f '$(DESTDIR)$(bindir)/ecpg$(X)' diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 753dfe23a8b..b56b640bba9 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.174 2009/07/13 01:37:05 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.175 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -113,7 +113,7 @@ install: all installdirs install-lib $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample '$(DESTDIR)$(datadir)/pg_service.conf.sample' installdirs: installdirs-lib - $(mkinstalldirs) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' + $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(includedir_internal)' uninstall: uninstall-lib rm -f '$(DESTDIR)$(includedir)/libpq-fe.h' diff --git a/src/makefiles/Makefile b/src/makefiles/Makefile index b8756ba76a5..c39128898d0 100644 --- a/src/makefiles/Makefile +++ b/src/makefiles/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile,v 1.2 2005/12/09 21:19:36 petere Exp $ +# $PostgreSQL: pgsql/src/makefiles/Makefile,v 1.3 2009/08/26 22:24:43 petere Exp $ subdir = src/makefiles top_builddir = ../.. @@ -9,7 +9,7 @@ install: all installdirs $(INSTALL_DATA) $(srcdir)/pgxs.mk '$(DESTDIR)$(pgxsdir)/$(subdir)/' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(pgxsdir)/$(subdir)' + $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)' uninstall: rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/pgxs.mk' diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 2f3b61cfe5f..f950a717aed 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -1,6 +1,6 @@ # PGXS: PostgreSQL extensions makefile -# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.16 2009/07/08 13:47:29 petere Exp $ +# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.17 2009/08/26 22:24:43 petere Exp $ # This file contains generic rules to build many kinds of simple # extension modules. You only need to set a few variables and include @@ -137,21 +137,21 @@ endif # MODULE_big installdirs: ifneq (,$(DATA)$(DATA_built)) - $(mkinstalldirs) '$(DESTDIR)$(datadir)/contrib' + $(MKDIR_P) '$(DESTDIR)$(datadir)/contrib' endif ifneq (,$(DATA_TSEARCH)) - $(mkinstalldirs) '$(DESTDIR)$(datadir)/tsearch_data' + $(MKDIR_P) '$(DESTDIR)$(datadir)/tsearch_data' endif ifneq (,$(MODULES)) - $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' endif ifdef DOCS ifdef docdir - $(mkinstalldirs) '$(DESTDIR)$(docdir)/contrib' + $(MKDIR_P) '$(DESTDIR)$(docdir)/contrib' endif # docdir endif # DOCS ifneq (,$(PROGRAM)$(SCRIPTS)$(SCRIPTS_built)) - $(mkinstalldirs) '$(DESTDIR)$(bindir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' endif ifdef MODULE_big diff --git a/src/nls-global.mk b/src/nls-global.mk index da131d067c8..9fa70f60fda 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/nls-global.mk,v 1.20 2009/01/20 09:58:50 petere Exp $ +# $PostgreSQL: pgsql/src/nls-global.mk,v 1.21 2009/08/26 22:24:42 petere Exp $ # Common rules for Native Language Support (NLS) # @@ -55,7 +55,7 @@ po/$(CATALOG_NAME).pot: $(GETTEXT_FILES) $(MAKEFILE_LIST) # consistent #: file references in the po files. $(XGETTEXT) -D $(srcdir) -n $(addprefix -k, $(GETTEXT_TRIGGERS)) $(GETTEXT_FILES) endif - @$(mkinstalldirs) $(dir $@) + @$(MKDIR_P) $(dir $@) sed -e '1,18 { s/SOME DESCRIPTIVE TITLE./LANGUAGE message translation file for $(CATALOG_NAME)/;s/PACKAGE/PostgreSQL/g;s/VERSION/$(MAJORVERSION)/g;s/YEAR/'`date +%Y`'/g; }' messages.po >$@ rm messages.po else # not XGETTEXT @@ -72,7 +72,7 @@ ifneq (,$(LANGUAGES)) endif installdirs-po: - $(mkinstalldirs) $(foreach lang, $(LANGUAGES), '$(DESTDIR)$(localedir)'/$(lang)/LC_MESSAGES) + $(MKDIR_P) $(foreach lang, $(LANGUAGES), '$(DESTDIR)$(localedir)'/$(lang)/LC_MESSAGES) uninstall-po: rm -f $(foreach lang, $(LANGUAGES), '$(DESTDIR)$(localedir)'/$(lang)/LC_MESSAGES/$(CATALOG_NAME)$(SO_MAJOR_VERSION)-$(MAJORVERSION).mo) diff --git a/src/pl/tcl/modules/Makefile b/src/pl/tcl/modules/Makefile index 279449e76e9..d52bd3973c3 100644 --- a/src/pl/tcl/modules/Makefile +++ b/src/pl/tcl/modules/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/tcl/modules/Makefile,v 1.4 2005/12/09 21:19:36 petere Exp $ +# $PostgreSQL: pgsql/src/pl/tcl/modules/Makefile,v 1.5 2009/08/26 22:24:43 petere Exp $ subdir = src/pl/tcl/modules top_builddir = ../../../.. @@ -19,7 +19,7 @@ install: all installdirs $(INSTALL_DATA) $(srcdir)/unknown.pltcl '$(DESTDIR)$(datadir)/unknown.pltcl' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(bindir)' '$(DESTDIR)$(datadir)' + $(MKDIR_P) '$(DESTDIR)$(bindir)' '$(DESTDIR)$(datadir)' uninstall: rm -f '$(DESTDIR)$(bindir)/pltcl_loadmod' '$(DESTDIR)$(bindir)/pltcl_delmod' '$(DESTDIR)$(bindir)/pltcl_listmod' '$(DESTDIR)$(datadir)/unknown.pltcl' diff --git a/src/port/Makefile b/src/port/Makefile index 7fc6f97119a..d102c048cb1 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -19,7 +19,7 @@ # OBJS adds additional object files that are always compiled. # # IDENTIFICATION -# $PostgreSQL: pgsql/src/port/Makefile,v 1.37 2008/11/25 18:19:31 tgl Exp $ +# $PostgreSQL: pgsql/src/port/Makefile,v 1.38 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -46,7 +46,7 @@ install: all installdirs $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(libdir)' + $(MKDIR_P) '$(DESTDIR)$(libdir)' uninstall: rm -f '$(DESTDIR)$(libdir)/libpgport.a' diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 8fe55ee3577..bbe04927975 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -6,7 +6,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.77 2009/01/01 17:24:04 momjian Exp $ +# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.78 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -66,7 +66,7 @@ install: all installdirs $(INSTALL_PROGRAM) pg_regress$(X) '$(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress$(X)' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(pgxsdir)/$(subdir)' + $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(subdir)' uninstall: rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress$(X)' @@ -104,7 +104,7 @@ install-tests: all install install-lib installdirs-tests done installdirs-tests: installdirs - $(mkinstalldirs) $(patsubst $(srcdir)/%/,'$(DESTDIR)$(pkglibdir)/regress/%',$(sort $(dir $(regress_data_files)))) + $(MKDIR_P) $(patsubst $(srcdir)/%/,'$(DESTDIR)$(pkglibdir)/regress/%',$(sort $(dir $(regress_data_files)))) # Get some extra C modules from contrib/spi... diff --git a/src/timezone/Makefile b/src/timezone/Makefile index 3171eb40979..fda2fa703a6 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.31 2009/01/06 02:25:29 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.32 2009/08/26 22:24:43 petere Exp $ # #------------------------------------------------------------------------- @@ -56,7 +56,7 @@ endif $(MAKE) -C tznames $@ installdirs: - $(mkinstalldirs) '$(DESTDIR)$(datadir)' + $(MKDIR_P) '$(DESTDIR)$(datadir)' uninstall: ifeq (,$(with_system_tzdata)) diff --git a/src/timezone/tznames/Makefile b/src/timezone/tznames/Makefile index 8f1c6447b64..f52f1d8176a 100644 --- a/src/timezone/tznames/Makefile +++ b/src/timezone/tznames/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone names # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/tznames/Makefile,v 1.2 2007/02/09 15:56:00 petere Exp $ +# $PostgreSQL: pgsql/src/timezone/tznames/Makefile,v 1.3 2009/08/26 22:24:44 petere Exp $ # #------------------------------------------------------------------------- @@ -24,7 +24,7 @@ install: installdirs $(INSTALL_DATA) $(TZNAMES_SETS_FILES) '$(DESTDIR)$(datadir)/timezonesets' installdirs: - $(mkinstalldirs) '$(DESTDIR)$(datadir)/timezonesets' + $(MKDIR_P) '$(DESTDIR)$(datadir)/timezonesets' uninstall: rm -rf '$(DESTDIR)$(datadir)/timezonesets' |