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/makefiles | |
| 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/makefiles')
| -rw-r--r-- | src/makefiles/Makefile | 4 | ||||
| -rw-r--r-- | src/makefiles/pgxs.mk | 12 |
2 files changed, 8 insertions, 8 deletions
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 |