summaryrefslogtreecommitdiffstats
path: root/gettext-runtime
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-runtime')
-rw-r--r--gettext-runtime/intl-csharp/ChangeLog4
-rw-r--r--gettext-runtime/intl-csharp/Makefile.am10
-rw-r--r--gettext-runtime/intl-java/ChangeLog4
-rw-r--r--gettext-runtime/intl-java/Makefile.am22
-rw-r--r--gettext-runtime/intl/ChangeLog7
-rw-r--r--gettext-runtime/intl/Makefile.in25
-rw-r--r--gettext-runtime/libasprintf/ChangeLog4
-rw-r--r--gettext-runtime/libasprintf/Makefile.am16
-rw-r--r--gettext-runtime/m4/ChangeLog7
-rw-r--r--gettext-runtime/m4/gettext.m44
-rw-r--r--gettext-runtime/m4/nls.m424
-rw-r--r--gettext-runtime/m4/po.m44
-rw-r--r--gettext-runtime/man/ChangeLog4
-rw-r--r--gettext-runtime/man/Makefile.am4
-rw-r--r--gettext-runtime/po/ChangeLog7
-rw-r--r--gettext-runtime/po/Makefile.in.in15
16 files changed, 88 insertions, 73 deletions
diff --git a/gettext-runtime/intl-csharp/ChangeLog b/gettext-runtime/intl-csharp/ChangeLog
index 26fd7f1..41d27d5 100644
--- a/gettext-runtime/intl-csharp/ChangeLog
+++ b/gettext-runtime/intl-csharp/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).
+
2005-12-04 Bruno Haible <bruno@clisp.org>
* Makefile.am (CSHARPCOMPFLAGS): Use value set by csharpcomp.m4.
diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am
index 67519bc..28db6ff 100644
--- a/gettext-runtime/intl-csharp/Makefile.am
+++ b/gettext-runtime/intl-csharp/Makefile.am
@@ -51,13 +51,13 @@ CLEANFILES += GNU.Gettext.dll
install-dll: install-dll-@BUILDCSHARP@
install-dll-no:
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ $(mkdir_p) $(DESTDIR)$(libdir)
install-dll-yes: all-dll-yes
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ $(mkdir_p) $(DESTDIR)$(libdir)
$(INSTALL_DATA) GNU.Gettext.dll $(DESTDIR)$(libdir)/GNU.Gettext.dll
installdirs-dll:
- $(mkinstalldirs) $(DESTDIR)$(libdir)
+ $(mkdir_p) $(DESTDIR)$(libdir)
uninstall-dll:
$(RM) $(DESTDIR)$(libdir)/GNU.Gettext.dll
@@ -87,14 +87,14 @@ DOC_FILES = \
EXTRA_DIST += $(DOC_FILES)
install-doc: all-doc
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/csharpdoc
+ $(mkdir_p) $(DESTDIR)$(htmldir)/csharpdoc
@for f in $(DOC_FILES); do \
echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
done
installdirs-doc:
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/csharpdoc
+ $(mkdir_p) $(DESTDIR)$(htmldir)/csharpdoc
uninstall-doc:
@for f in $(DOC_FILES); do \
diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog
index 7ae9495..82e4662 100644
--- a/gettext-runtime/intl-java/ChangeLog
+++ b/gettext-runtime/intl-java/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).
+
2005-05-23 Bruno Haible <bruno@clisp.org>
* gettext-0.14.5 released.
diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am
index 7919cf7..94d2c55 100644
--- a/gettext-runtime/intl-java/Makefile.am
+++ b/gettext-runtime/intl-java/Makefile.am
@@ -57,13 +57,13 @@ CLEANFILES += libintl.jar gnu/gettext/*.class
install-classes: install-classes-@BUILDJAVA@
install-classes-no:
- $(mkinstalldirs) $(DESTDIR)$(jardir)
+ $(mkdir_p) $(DESTDIR)$(jardir)
install-classes-yes: all-classes-yes
- $(mkinstalldirs) $(DESTDIR)$(jardir)
+ $(mkdir_p) $(DESTDIR)$(jardir)
$(INSTALL_DATA) libintl.jar $(DESTDIR)$(jardir)/libintl.jar
installdirs-classes:
- $(mkinstalldirs) $(DESTDIR)$(jardir)
+ $(mkdir_p) $(DESTDIR)$(jardir)
uninstall-classes:
$(RM) $(DESTDIR)$(jardir)/libintl.jar
@@ -100,16 +100,16 @@ JAVADOC1_FILES = \
EXTRA_DIST += $(JAVADOC1_FILES)
install-javadoc1: all-javadoc1
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1/images
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1/images
@for f in $(JAVADOC1_FILES); do \
echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
done
installdirs-javadoc1:
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1/images
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc1/images
uninstall-javadoc1:
@for f in $(JAVADOC1_FILES); do \
@@ -144,16 +144,16 @@ JAVADOC2_FILES = \
EXTRA_DIST += $(JAVADOC2_FILES)
install-javadoc2: all-javadoc2
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
@for f in $(JAVADOC2_FILES); do \
echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f"; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldir)/$$f; \
done
installdirs-javadoc2:
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2
- $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2
+ $(mkdir_p) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext
uninstall-javadoc2:
@for f in $(JAVADOC2_FILES); do \
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index cc8d963..aa34c5c 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.in (MKINSTALLDIRS, mkinstalldirs): Remove variables.
+ (mkdir_p): New variable.
+ (install-exec, install-data, installdirs): Use $(mkdir_p) instead of
+ $(mkinstalldirs).
+
2006-04-05 Bruno Haible <bruno@clisp.org>
* config.charset: Update Juan Manuel Guerrero's address.
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index e8badc6..8b9f669 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -1,5 +1,5 @@
# Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
@@ -51,8 +51,7 @@ subdir = intl
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+mkdir_p = @mkdir_p@
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
@@ -299,7 +298,7 @@ install: install-exec install-data
install-exec: all
if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
&& test '@USE_INCLUDED_LIBINTL@' = yes; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+ $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
$(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
$(LIBTOOL) --mode=install \
$(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
@@ -315,7 +314,7 @@ install-exec: all
if test "$(PACKAGE)" = "gettext-tools" \
&& test '@USE_INCLUDED_LIBINTL@' = no \
&& test @GLIBC2@ != no; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ $(mkdir_p) $(DESTDIR)$(libdir); \
$(LIBTOOL) --mode=install \
$(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
@@ -326,7 +325,7 @@ install-exec: all
: ; \
fi
if test '@USE_INCLUDED_LIBINTL@' = yes; then \
- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
temp=$(DESTDIR)$(libdir)/t-charset.alias; \
dest=$(DESTDIR)$(libdir)/charset.alias; \
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -342,7 +341,7 @@ install-exec: all
rm -f $$temp; \
fi; \
fi; \
- $(mkinstalldirs) $(DESTDIR)$(localedir); \
+ $(mkdir_p) $(DESTDIR)$(localedir); \
test -f $(DESTDIR)$(localedir)/locale.alias \
&& orig=$(DESTDIR)$(localedir)/locale.alias \
|| orig=$(srcdir)/locale.alias; \
@@ -356,7 +355,7 @@ install-exec: all
fi
install-data: all
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
$(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
$(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
@@ -384,25 +383,25 @@ install-strip: install
installdirs:
if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
&& test '@USE_INCLUDED_LIBINTL@' = yes; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+ $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
else \
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools" \
&& test '@USE_INCLUDED_LIBINTL@' = no \
&& test @GLIBC2@ != no; then \
- $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ $(mkdir_p) $(DESTDIR)$(libdir); \
else \
: ; \
fi
if test '@USE_INCLUDED_LIBINTL@' = yes; then \
- test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
- $(mkinstalldirs) $(DESTDIR)$(localedir); \
+ test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
+ $(mkdir_p) $(DESTDIR)$(localedir); \
else \
: ; \
fi
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index b26226b..a16e58f 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).
+
2006-04-11 Bruno Haible <bruno@clisp.org>
* autosprintf.texi: Change license terms to FDL | GPL.
diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index 85ff94f..409c04e 100644
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -115,11 +115,11 @@ CLEANFILES = autosprintf.pdf
# Documentation in DVI format.
install-dvi: autosprintf.dvi
- $(mkinstalldirs) $(DESTDIR)$(dvidir)
+ $(mkdir_p) $(DESTDIR)$(dvidir)
$(INSTALL_DATA) `if test -f autosprintf.dvi; then echo .; else echo $(srcdir); fi`/autosprintf.dvi $(DESTDIR)$(dvidir)/autosprintf.dvi
installdirs-dvi:
- $(mkinstalldirs) $(DESTDIR)$(dvidir)
+ $(mkdir_p) $(DESTDIR)$(dvidir)
uninstall-dvi:
$(RM) $(DESTDIR)$(dvidir)/autosprintf.dvi
@@ -138,11 +138,11 @@ autosprintf.ps: autosprintf.dvi
$(DVIPS) -o $@ `if test -f autosprintf.dvi; then echo autosprintf.dvi; else echo $(srcdir)/autosprintf.dvi; fi`
install-ps: autosprintf.ps
- $(mkinstalldirs) $(DESTDIR)$(psdir)
+ $(mkdir_p) $(DESTDIR)$(psdir)
$(INSTALL_DATA) `if test -f autosprintf.ps; then echo .; else echo $(srcdir); fi`/autosprintf.ps $(DESTDIR)$(psdir)/autosprintf.ps
installdirs-ps:
- $(mkinstalldirs) $(DESTDIR)$(psdir)
+ $(mkdir_p) $(DESTDIR)$(psdir)
uninstall-ps:
$(RM) $(DESTDIR)$(psdir)/autosprintf.ps
@@ -153,11 +153,11 @@ uninstall-ps:
SUFFIXES = .pdf
install-pdf: autosprintf.pdf
- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
+ $(mkdir_p) $(DESTDIR)$(pdfdir)
$(INSTALL_DATA) `if test -f autosprintf.pdf; then echo .; else echo $(srcdir); fi`/autosprintf.pdf $(DESTDIR)$(pdfdir)/autosprintf.pdf
installdirs-pdf:
- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
+ $(mkdir_p) $(DESTDIR)$(pdfdir)
uninstall-pdf:
$(RM) $(DESTDIR)$(pdfdir)/autosprintf.pdf
@@ -176,11 +176,11 @@ autosprintf_all.html: autosprintf.texi
mv autosprintf.html autosprintf_all.html
install-html: autosprintf_all.html
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
+ $(mkdir_p) $(DESTDIR)$(htmldir)
$(INSTALL_DATA) `if test -f autosprintf_all.html; then echo .; else echo $(srcdir); fi`/autosprintf_all.html $(DESTDIR)$(htmldir)/autosprintf.html
installdirs-html:
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
+ $(mkdir_p) $(DESTDIR)$(htmldir)
uninstall-html:
$(RM) $(DESTDIR)$(htmldir)/autosprintf.html
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index ab7ff4f..2907534 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * nls.m4 (AM_MKINSTALLDIRS): Remove macro.
+ * gettext.m4 (AM_INTL_SUBDIR): Require AM_PROG_MKDIR_P instead of
+ AM_MKINSTALLDIRS.
+ * po.m4 (AM_PO_SUBDIRS): Likewise.
+
2006-04-14 Bruno Haible <bruno@clisp.org>
Prepare for autoconf-2.60.
diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 629e104..d8e8f0d 100644
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,4 +1,4 @@
-# gettext.m4 serial 45 (gettext-0.15)
+# gettext.m4 serial 46 (gettext-0.15)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -353,7 +353,7 @@ dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
AC_DEFUN([AM_INTL_SUBDIR],
[
AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([gt_GLIBC2])dnl
diff --git a/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4
index 2082c3b..7967cc2 100644
--- a/gettext-runtime/m4/nls.m4
+++ b/gettext-runtime/m4/nls.m4
@@ -1,5 +1,5 @@
-# nls.m4 serial 2 (gettext-0.14.3)
-dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
+# nls.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -29,23 +29,3 @@ AC_DEFUN([AM_NLS],
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS)
])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
- dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
- dnl Try to locate it.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- case "$ac_aux_dir" in
- /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
- *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
- esac
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-])
diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index 60bfc45..c1ac760 100644
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,4 +1,4 @@
-# po.m4 serial 11 (gettext-0.15)
+# po.m4 serial 12 (gettext-0.15)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
AC_REQUIRE([AM_NLS])dnl
dnl Perform the following tests also if --disable-nls has been given,
diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog
index 2af2a14..6b3cf5b 100644
--- a/gettext-runtime/man/ChangeLog
+++ b/gettext-runtime/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).
+
2005-05-23 Bruno Haible <bruno@clisp.org>
* gettext-0.14.5 released.
diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am
index 10364a9..6f22614 100644
--- a/gettext-runtime/man/Makefile.am
+++ b/gettext-runtime/man/Makefile.am
@@ -165,14 +165,14 @@ bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
mv t-$@ $@
install-html:
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
+ $(mkdir_p) $(DESTDIR)$(htmldir)
for file in $(man_HTML); do \
if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
$(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
done
installdirs-html:
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
+ $(mkdir_p) $(DESTDIR)$(htmldir)
uninstall-html:
for file in $(man_HTML); do \
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 709de57..f364f7b 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-17 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.in.in (MKINSTALLDIRS, mkinstalldirs): Remove variables.
+ (mkdir_p): New variable.
+ (install-data, install-data-yes, installdirs-data,
+ installdirs-data-yes): Use $(mkdir_p) instead of $(mkinstalldirs).
+
2006-04-14 Bruno Haible <bruno@clisp.org>
Don't ignore the --localedir option from autoconf >= 2.60.
diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in
index 0fd7072..a059a03 100644
--- a/gettext-runtime/po/Makefile.in.in
+++ b/gettext-runtime/po/Makefile.in.in
@@ -30,8 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+mkdir_p = @mkdir_p@
GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
@@ -168,7 +167,7 @@ install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
for file in $(DISTFILES.common) Makevars.template; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -181,13 +180,13 @@ install-data: install-data-@USE_NLS@
fi
install-data-no: all
install-data-yes: all
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkdir_p) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -227,19 +226,19 @@ installdirs: installdirs-exec installdirs-data
installdirs-exec:
installdirs-data: installdirs-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
installdirs-data-no:
installdirs-data-yes:
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkdir_p) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
generated by cgit v1.1 at 2025-11-27 13:41:28 +0000