aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2009-08-26 22:24:44 +0000
committerPeter Eisentraut <peter_e@gmx.net>2009-08-26 22:24:44 +0000
commit9d182ef002b15c873074c710b709149450ddbcd9 (patch)
tree76bacc6e91c2ea2328c60972f361c8735a06ca77 /src/backend
parent7ca774a8739bc3887abda2a0259703729026a5ca (diff)
downloadpostgresql-9d182ef002b15c873074c710b709149450ddbcd9.tar.gz
postgresql-9d182ef002b15c873074c710b709149450ddbcd9.zip
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/backend')
-rw-r--r--src/backend/Makefile10
-rw-r--r--src/backend/catalog/Makefile4
-rw-r--r--src/backend/snowball/Makefile4
-rw-r--r--src/backend/tsearch/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/Makefile4
5 files changed, 13 insertions, 13 deletions
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)'