summaryrefslogtreecommitdiff
path: root/src/nls-global.mk
diff options
context:
space:
mode:
authorPeter Eisentraut2009-08-26 22:24:44 +0000
committerPeter Eisentraut2009-08-26 22:24:44 +0000
commit9d182ef002b15c873074c710b709149450ddbcd9 (patch)
tree76bacc6e91c2ea2328c60972f361c8735a06ca77 /src/nls-global.mk
parent7ca774a8739bc3887abda2a0259703729026a5ca (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/nls-global.mk')
-rw-r--r--src/nls-global.mk6
1 files changed, 3 insertions, 3 deletions
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)