Stop using the mkinstalldirs script.

51 files changed, 177 insertions, 175 deletions

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 662cd15..05fc3b1 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,31 @@
+2006-04-17  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs).
+	* hello-csharp/Makefile.am: Likewise.
+	* hello-csharp-forms/Makefile.am: Likewise.
+	* hello-java/Makefile.am: Likewise.
+	* hello-java-awt/Makefile.am: Likewise.
+	* hello-java-swing/Makefile.am: Likewise.
+	* hello-pascal/Makefile.am: Likewise.
+	* hello-c++-qt/po/Makefile.am: Likewise.
+	* hello-c++-wxwidgets/po/Makefile.am: Likewise.
+	* hello-clisp/po/Makefile.am: Likewise.
+	* hello-csharp/po/Makefile.am: Likewise.
+	* hello-csharp-forms/po/Makefile.am: Likewise.
+	* hello-gawk/po/Makefile.am: Likewise.
+	* hello-guile/po/Makefile.am: Likewise.
+	* hello-librep/po/Makefile.am: Likewise.
+	* hello-pascal/po/Makefile.am: Likewise.
+	* hello-perl/po/Makefile.am: Likewise.
+	* hello-php/po/Makefile.am: Likewise.
+	* hello-python/po/Makefile.am: Likewise.
+	* hello-sh/po/Makefile.am: Likewise.
+	* hello-smalltalk/po/Makefile.am: Likewise.
+	* hello-tcl/po/Makefile.am: Likewise.
+	* hello-tcl-tk/po/Makefile.am: Likewise.
+	* hello-ycp/po/Makefile.am: Likewise.
+	* hello-*/autoclean.sh: Don't remove mkinstalldirs.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
 	Don't ignore the --localedir option from autoconf >= 2.60.
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index a102eec..8857408 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -1046,10 +1046,10 @@ EXAMPLESFILES = \
   README
 
 install-data-local: $(EXAMPLESFILES)
-	$(mkinstalldirs) $(DESTDIR)$(examplesdir)
+	$(mkdir_p) $(DESTDIR)$(examplesdir)
 	for f in $(EXAMPLESFILES); do \
 	  d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	  test -z "$$d" || $(mkinstalldirs) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	  test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	  b=`echo $$f | sed -e 's,^.*/,,'`; \
 	  if test $$b = autogen.sh || test $$b = autoclean.sh; then \
 	    echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(examplesdir)/$$f"; \
@@ -1061,10 +1061,10 @@ install-data-local: $(EXAMPLESFILES)
 	done
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(examplesdir)
+	$(mkdir_p) $(DESTDIR)$(examplesdir)
 	for f in $(EXAMPLESFILES); do \
 	  d=`echo /$$f | sed -e 's,/[^/]*$$,,'`; \
-	  test -z "$$d" || $(mkinstalldirs) $(DESTDIR)$(examplesdir)$$d || exit 1; \
+	  test -z "$$d" || $(mkdir_p) $(DESTDIR)$(examplesdir)$$d || exit 1; \
 	done
 
 uninstall-local:
@@ -1080,7 +1080,7 @@ distdir1:
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    $(mkdir_p) "$(distdir)/$$dir"; \
 	  fi; \
 	  cp -p $$d/$$file $(distdir)/$$file || exit 1; \
 	done
diff --git a/gettext-tools/examples/hello-c++-gnome/autoclean.sh b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
index ef77e4f..be96380 100755
--- a/gettext-tools/examples/hello-c++-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-gnome/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -41,7 +41,6 @@ rm -f m4/visibility.m4
 rm -f m4/wchar_t.m4
 rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
-rm -f mkinstalldirs
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c++-qt/autoclean.sh b/gettext-tools/examples/hello-c++-qt/autoclean.sh
index 5faf36d..cf67d16 100755
--- a/gettext-tools/examples/hello-c++-qt/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-qt/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f config.guess
 rm -f config.sub
diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
index afe2e3f..92999c3 100644
--- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
@@ -164,7 +164,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/locale
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/locale
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -176,7 +176,7 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/locale
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/locale
 
 uninstall-local: uninstall-local-@USE_NLS@
 uninstall-local-no:
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh b/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh
index 1f69bef..9aff413 100755
--- a/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh
+++ b/gettext-tools/examples/hello-c++-wxwidgets/autoclean.sh
@@ -28,7 +28,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f config.guess
 rm -f config.sub
diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index 2ff4aa0..c1e2928 100644
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -171,13 +171,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -214,13 +214,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-c++/autoclean.sh b/gettext-tools/examples/hello-c++/autoclean.sh
index 591d6a9..005d699 100755
--- a/gettext-tools/examples/hello-c++/autoclean.sh
+++ b/gettext-tools/examples/hello-c++/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -44,7 +44,6 @@ rm -f m4/visibility.m4
 rm -f m4/wchar_t.m4
 rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
-rm -f mkinstalldirs
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c-gnome/autoclean.sh b/gettext-tools/examples/hello-c-gnome/autoclean.sh
index ef77e4f..be96380 100755
--- a/gettext-tools/examples/hello-c-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-c-gnome/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -41,7 +41,6 @@ rm -f m4/visibility.m4
 rm -f m4/wchar_t.m4
 rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
-rm -f mkinstalldirs
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-c/autoclean.sh b/gettext-tools/examples/hello-c/autoclean.sh
index 591d6a9..005d699 100755
--- a/gettext-tools/examples/hello-c/autoclean.sh
+++ b/gettext-tools/examples/hello-c/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -44,7 +44,6 @@ rm -f m4/visibility.m4
 rm -f m4/wchar_t.m4
 rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
-rm -f mkinstalldirs
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-clisp/autoclean.sh b/gettext-tools/examples/hello-clisp/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-clisp/autoclean.sh
+++ b/gettext-tools/examples/hello-clisp/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index 9e42322..2678a3f 100644
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-csharp-forms/Makefile.am b/gettext-tools/examples/hello-csharp-forms/Makefile.am
index 5d5ae97..1755bfe 100644
--- a/gettext-tools/examples/hello-csharp-forms/Makefile.am
+++ b/gettext-tools/examples/hello-csharp-forms/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -53,19 +53,19 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_DATA) hello.net.exe $(DESTDIR)$(pkglibdir)/hello.net.exe
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) csharpexec.sh $(DESTDIR)$(pkgdatadir)/csharpexec.sh
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff --git a/gettext-tools/examples/hello-csharp-forms/autoclean.sh b/gettext-tools/examples/hello-csharp-forms/autoclean.sh
index 388ecf8..604fb41 100755
--- a/gettext-tools/examples/hello-csharp-forms/autoclean.sh
+++ b/gettext-tools/examples/hello-csharp-forms/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -31,7 +31,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
index 4e31c39..389231c 100644
--- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -153,10 +153,10 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$(pkglibdir)/$$cat; \
 	  echo "installing $$realcat as $(DESTDIR)$(pkglibdir)/$$cat"; \
@@ -165,10 +165,10 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	done
 
 uninstall-local: uninstall-local-@USE_NLS@
diff --git a/gettext-tools/examples/hello-csharp/Makefile.am b/gettext-tools/examples/hello-csharp/Makefile.am
index ad4eb65..044fd0f 100644
--- a/gettext-tools/examples/hello-csharp/Makefile.am
+++ b/gettext-tools/examples/hello-csharp/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -53,19 +53,19 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_DATA) hello.net.exe $(DESTDIR)$(pkglibdir)/hello.net.exe
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) csharpexec.sh $(DESTDIR)$(pkgdatadir)/csharpexec.sh
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff --git a/gettext-tools/examples/hello-csharp/autoclean.sh b/gettext-tools/examples/hello-csharp/autoclean.sh
index 388ecf8..604fb41 100755
--- a/gettext-tools/examples/hello-csharp/autoclean.sh
+++ b/gettext-tools/examples/hello-csharp/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -31,7 +31,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am
index 4e31c39..389231c 100644
--- a/gettext-tools/examples/hello-csharp/po/Makefile.am
+++ b/gettext-tools/examples/hello-csharp/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -153,10 +153,10 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$(pkglibdir)/$$cat; \
 	  echo "installing $$realcat as $(DESTDIR)$(pkglibdir)/$$cat"; \
@@ -165,10 +165,10 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  $(mkinstalldirs) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
+	  $(mkdir_p) $(DESTDIR)$(pkglibdir)/`echo $$cat | sed -e 's,/[^/]*$$,,'`; \
 	done
 
 uninstall-local: uninstall-local-@USE_NLS@
diff --git a/gettext-tools/examples/hello-gawk/autoclean.sh b/gettext-tools/examples/hello-gawk/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-gawk/autoclean.sh
+++ b/gettext-tools/examples/hello-gawk/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index 71d6c7a..ed07ae0 100644
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-guile/autoclean.sh b/gettext-tools/examples/hello-guile/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-guile/autoclean.sh
+++ b/gettext-tools/examples/hello-guile/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index 27d0463..8f32488 100644
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-java-awt/Makefile.am b/gettext-tools/examples/hello-java-awt/Makefile.am
index e10346a..1d9c1e0 100644
--- a/gettext-tools/examples/hello-java-awt/Makefile.am
+++ b/gettext-tools/examples/hello-java-awt/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -94,19 +94,19 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -142,18 +142,18 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff --git a/gettext-tools/examples/hello-java-awt/autoclean.sh b/gettext-tools/examples/hello-java-awt/autoclean.sh
index 3d987e4..6ae43d8 100755
--- a/gettext-tools/examples/hello-java-awt/autoclean.sh
+++ b/gettext-tools/examples/hello-java-awt/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -31,7 +31,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-java-swing/Makefile.am b/gettext-tools/examples/hello-java-swing/Makefile.am
index 3482164..ae9e66f 100644
--- a/gettext-tools/examples/hello-java-swing/Makefile.am
+++ b/gettext-tools/examples/hello-java-swing/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -94,19 +94,19 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -142,18 +142,18 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff --git a/gettext-tools/examples/hello-java-swing/autoclean.sh b/gettext-tools/examples/hello-java-swing/autoclean.sh
index 37110e1..b050dae 100755
--- a/gettext-tools/examples/hello-java-swing/autoclean.sh
+++ b/gettext-tools/examples/hello-java-swing/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -31,7 +31,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-java/Makefile.am b/gettext-tools/examples/hello-java/Makefile.am
index 9b3424c..37a186b 100644
--- a/gettext-tools/examples/hello-java/Makefile.am
+++ b/gettext-tools/examples/hello-java/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -94,19 +94,19 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
 	$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(hello_MAINCLASS)$(EXEEXT) $(DESTDIR)$(pkglibdir)/$(hello_MAINCLASS)$(EXEEXT)
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello-resources.jar $(DESTDIR)$(jardir)/hello-resources.jar
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(pkglibdir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
@@ -142,18 +142,18 @@ hello.sh:
 	} > $@
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) hello.sh $(DESTDIR)$(bindir)/hello
 
 install-data-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
 	$(INSTALL_DATA) hello.jar $(DESTDIR)$(jardir)/hello.jar
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) javaexec.sh $(DESTDIR)$(pkgdatadir)/javaexec.sh
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(jardir)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(mkdir_p) $(DESTDIR)$(jardir)
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello
diff --git a/gettext-tools/examples/hello-java/autoclean.sh b/gettext-tools/examples/hello-java/autoclean.sh
index fcf7b10..157779b 100755
--- a/gettext-tools/examples/hello-java/autoclean.sh
+++ b/gettext-tools/examples/hello-java/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -31,7 +31,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-librep/autoclean.sh b/gettext-tools/examples/hello-librep/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-librep/autoclean.sh
+++ b/gettext-tools/examples/hello-librep/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index 1ef02b2..c1a3420 100644
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-objc-gnome/autoclean.sh b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
index ef77e4f..be96380 100755
--- a/gettext-tools/examples/hello-objc-gnome/autoclean.sh
+++ b/gettext-tools/examples/hello-objc-gnome/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -41,7 +41,6 @@ rm -f m4/visibility.m4
 rm -f m4/wchar_t.m4
 rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
-rm -f mkinstalldirs
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-objc/autoclean.sh b/gettext-tools/examples/hello-objc/autoclean.sh
index 591d6a9..005d699 100755
--- a/gettext-tools/examples/hello-objc/autoclean.sh
+++ b/gettext-tools/examples/hello-objc/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -44,7 +44,6 @@ rm -f m4/visibility.m4
 rm -f m4/wchar_t.m4
 rm -f m4/wint_t.m4
 rm -f m4/xsize.m4
-rm -f mkinstalldirs
 rm -f po/Makefile.in.in
 rm -f po/remove-potcdate.sin
 
diff --git a/gettext-tools/examples/hello-pascal/Makefile.am b/gettext-tools/examples/hello-pascal/Makefile.am
index e7c48d1..2826549 100644
--- a/gettext-tools/examples/hello-pascal/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -29,11 +29,11 @@ hello$(EXEEXT) hello.rst: $(hello_SOURCES)
 	LOCALEDIR='@localedir@' $(PPC) $(hello_SOURCES)
 
 install-exec-local: all-local
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) hello$(EXEEXT) $(DESTDIR)$(bindir)/hello$(EXEEXT)
 
 installdirs-local:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkdir_p) $(DESTDIR)$(bindir)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/hello$(EXEEXT)
diff --git a/gettext-tools/examples/hello-pascal/autoclean.sh b/gettext-tools/examples/hello-pascal/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-pascal/autoclean.sh
+++ b/gettext-tools/examples/hello-pascal/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index 5650993..9181db7 100644
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-perl/autoclean.sh b/gettext-tools/examples/hello-perl/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-perl/autoclean.sh
+++ b/gettext-tools/examples/hello-perl/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index 0881bc3..831a7f3 100644
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -175,13 +175,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -218,13 +218,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-php/autoclean.sh b/gettext-tools/examples/hello-php/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-php/autoclean.sh
+++ b/gettext-tools/examples/hello-php/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index 4bb9120..c46742b 100644
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-python/autoclean.sh b/gettext-tools/examples/hello-python/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-python/autoclean.sh
+++ b/gettext-tools/examples/hello-python/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index f846f77..8eefee9 100644
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-sh/autoclean.sh b/gettext-tools/examples/hello-sh/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-sh/autoclean.sh
+++ b/gettext-tools/examples/hello-sh/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index 2f53ab8..c4292f7 100644
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-smalltalk/autoclean.sh b/gettext-tools/examples/hello-smalltalk/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-smalltalk/autoclean.sh
+++ b/gettext-tools/examples/hello-smalltalk/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 13b8508..47d9947 100644
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \
diff --git a/gettext-tools/examples/hello-tcl-tk/autoclean.sh b/gettext-tools/examples/hello-tcl-tk/autoclean.sh
index 7b5d858..460f695 100755
--- a/gettext-tools/examples/hello-tcl-tk/autoclean.sh
+++ b/gettext-tools/examples/hello-tcl-tk/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
index e5c3a08..4ac9670 100644
--- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -151,7 +151,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -163,7 +163,7 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 
 uninstall-local: uninstall-local-@USE_NLS@
 uninstall-local-no:
diff --git a/gettext-tools/examples/hello-tcl/autoclean.sh b/gettext-tools/examples/hello-tcl/autoclean.sh
index 7b5d858..460f695 100755
--- a/gettext-tools/examples/hello-tcl/autoclean.sh
+++ b/gettext-tools/examples/hello-tcl/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am
index e5c3a08..4ac9670 100644
--- a/gettext-tools/examples/hello-tcl/po/Makefile.am
+++ b/gettext-tools/examples/hello-tcl/po/Makefile.am
@@ -1,5 +1,5 @@
 # Example for use of GNU gettext.
-# Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Makefile configuration - processed by automake.
@@ -151,7 +151,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -163,7 +163,7 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-yes:
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/msgs
+	$(mkdir_p) $(DESTDIR)$(pkgdatadir)/msgs
 
 uninstall-local: uninstall-local-@USE_NLS@
 uninstall-local-no:
diff --git a/gettext-tools/examples/hello-ycp/autoclean.sh b/gettext-tools/examples/hello-ycp/autoclean.sh
index 7fd9f34..e144a54 100755
--- a/gettext-tools/examples/hello-ycp/autoclean.sh
+++ b/gettext-tools/examples/hello-ycp/autoclean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Example for use of GNU gettext.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # This file is in the public domain.
 #
 # Script for cleaning all autogenerated files.
@@ -24,7 +24,6 @@ rm -f Makefile.in
 rm -f m4/Makefile.in
 rm -f po/Makefile.in
 rm -f install-sh
-rm -f mkinstalldirs
 rm -f missing
 rm -f po/*.pot
 rm -f po/stamp-po
diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index 21df992..6e1dc58 100644
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -165,13 +165,13 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
 install-data-local: install-data-local-@USE_NLS@
 install-data-local-no: all-local
 install-data-local-yes: all-local
-	$(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"; \
@@ -208,13 +208,13 @@ install-data-local-yes: all-local
 installdirs-local: installdirs-local-@USE_NLS@
 installdirs-local-no:
 installdirs-local-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 \