diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-04-22 14:16:31 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:13:11 +0200 |
| commit | ebdacfb2d0f5e376ca1e03005d924b5f99e139bd (patch) | |
| tree | dcb5e308cc0e1180d13a5c282d4e7e6b75ebf361 | |
| parent | c517d1cdf263cb7c84e5d759a33d0d5dbef48a51 (diff) | |
| download | external_gettext-ebdacfb2d0f5e376ca1e03005d924b5f99e139bd.zip external_gettext-ebdacfb2d0f5e376ca1e03005d924b5f99e139bd.tar.gz external_gettext-ebdacfb2d0f5e376ca1e03005d924b5f99e139bd.tar.bz2 | |
Stop using the mkinstalldirs script.
100 files changed, 383 insertions, 331 deletions
diff --git a/Admin/plans b/Admin/plans index 1d9739e..607d995 100644 --- a/Admin/plans +++ b/Admin/plans @@ -47,5 +47,3 @@ Things we plan to do. Comments welcome. - AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version.sh']) -- Use #(mkdir_p) instead of $(mkinstalldirs) in 2006. - @@ -1,3 +1,7 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * PACKAGING: Remove mkinstalldirs file. + 2006-04-20 Bruno Haible <bruno@clisp.org> * autogen.sh: Also regenerate examples PO files. @@ -61,6 +61,9 @@ their code. Binary compatibility is guaranteed, however. +* The 'mkinstalldirs' shell script is no longer needed and no longer installed + by gettextize. + * Portability to mingw. * Interoperability with expat version 2.0.0. @@ -108,7 +108,6 @@ following file list. $prefix/lib/gettext/* $prefix/share/locale/*/LC_MESSAGES/gettext-tools.mo $prefix/share/gettext/config.rpath - $prefix/share/gettext/mkinstalldirs $prefix/share/gettext/intl/* $prefix/share/gettext/po/* $prefix/share/gettext/projects/* diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog index 79d1878..b506c6c 100644 --- a/autoconf-lib-link/ChangeLog +++ b/autoconf-lib-link/ChangeLog @@ -1,3 +1,17 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * Makefile.am (all-local): Remove depedency on build-aux/mkinstalldirs. + (build-aux/mkinstalldirs): Remove rule. + (DISTCLEANFILES): Remove build-aux/mkinstalldirs. + * tests/rpathlx/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathly/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathlyx/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathlz/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathlzyx/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathx/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathy/Makefile.am (mkinstalldirs): Remove variable. + * tests/rpathz/Makefile.am (mkinstalldirs): Remove variable. + 2005-12-27 Bruno Haible <bruno@clisp.org> * config.rpath: Upgrade to libtool-1.5.22. diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am index 12e9d0e..b26f1c3 100644 --- a/autoconf-lib-link/Makefile.am +++ b/autoconf-lib-link/Makefile.am @@ -45,7 +45,7 @@ $(srcdir)/../build-aux/config.rpath: $(srcdir)/config.rpath # We choose this argument to be '../../../build-aux', for case 1, and therefore # we need to make a local copy of the build-aux directory, for case 2. -all-local: build-aux/config.guess build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh build-aux/mkinstalldirs build-aux/missing build-aux/config.rpath +all-local: build-aux/config.guess build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh build-aux/missing build-aux/config.rpath build-aux-dir: test -d build-aux || mkdir build-aux @@ -63,16 +63,13 @@ build-aux/install-sh: $(srcdir)/../build-aux/install-sh build-aux-dir build-aux/ltmain.sh: $(srcdir)/../build-aux/ltmain.sh build-aux-dir cp $(srcdir)/../build-aux/ltmain.sh build-aux/ltmain.sh -build-aux/mkinstalldirs: $(srcdir)/../build-aux/mkinstalldirs build-aux-dir - cp $(srcdir)/../build-aux/mkinstalldirs build-aux/mkinstalldirs - build-aux/missing: $(srcdir)/../build-aux/missing build-aux-dir cp $(srcdir)/../build-aux/missing build-aux/missing build-aux/config.rpath: $(srcdir)/config.rpath build-aux-dir cp $(srcdir)/config.rpath build-aux/config.rpath -DISTCLEANFILES += build-aux/config.guess build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh build-aux/mkinstalldirs build-aux/missing build-aux/config.rpath +DISTCLEANFILES += build-aux/config.guess build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh build-aux/missing build-aux/config.rpath distclean-local: rm -rf build-aux build-aux-dir diff --git a/autoconf-lib-link/tests/rpathlx/Makefile.am b/autoconf-lib-link/tests/rpathlx/Makefile.am index 233aa84..da6a22c 100644 --- a/autoconf-lib-link/tests/rpathlx/Makefile.am +++ b/autoconf-lib-link/tests/rpathlx/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs bin_PROGRAMS = usex usex_SOURCES = usex.c LDADD = @LIBRPATHX@ diff --git a/autoconf-lib-link/tests/rpathly/Makefile.am b/autoconf-lib-link/tests/rpathly/Makefile.am index d0d4a27..44812b5 100644 --- a/autoconf-lib-link/tests/rpathly/Makefile.am +++ b/autoconf-lib-link/tests/rpathly/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs bin_PROGRAMS = usey usey_SOURCES = usey.c LDADD = @LIBRPATHY@ diff --git a/autoconf-lib-link/tests/rpathlyx/Makefile.am b/autoconf-lib-link/tests/rpathlyx/Makefile.am index d0d4a27..44812b5 100644 --- a/autoconf-lib-link/tests/rpathlyx/Makefile.am +++ b/autoconf-lib-link/tests/rpathlyx/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs bin_PROGRAMS = usey usey_SOURCES = usey.c LDADD = @LIBRPATHY@ diff --git a/autoconf-lib-link/tests/rpathlz/Makefile.am b/autoconf-lib-link/tests/rpathlz/Makefile.am index 8c4327c..ff0e602 100644 --- a/autoconf-lib-link/tests/rpathlz/Makefile.am +++ b/autoconf-lib-link/tests/rpathlz/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs bin_PROGRAMS = usez usez_SOURCES = usez.c LDADD = @LIBRPATHZ@ diff --git a/autoconf-lib-link/tests/rpathlzyx/Makefile.am b/autoconf-lib-link/tests/rpathlzyx/Makefile.am index 8c4327c..ff0e602 100644 --- a/autoconf-lib-link/tests/rpathlzyx/Makefile.am +++ b/autoconf-lib-link/tests/rpathlzyx/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs bin_PROGRAMS = usez usez_SOURCES = usez.c LDADD = @LIBRPATHZ@ diff --git a/autoconf-lib-link/tests/rpathx/Makefile.am b/autoconf-lib-link/tests/rpathx/Makefile.am index 525ce4d..69b4cc9 100644 --- a/autoconf-lib-link/tests/rpathx/Makefile.am +++ b/autoconf-lib-link/tests/rpathx/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs lib_LTLIBRARIES = librpathx.la librpathx_la_SOURCES = rpathx.c librpathx_la_LDFLAGS = -lc -no-undefined diff --git a/autoconf-lib-link/tests/rpathy/Makefile.am b/autoconf-lib-link/tests/rpathy/Makefile.am index 26f288b..6b44f37 100644 --- a/autoconf-lib-link/tests/rpathy/Makefile.am +++ b/autoconf-lib-link/tests/rpathy/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs lib_LTLIBRARIES = librpathy.la librpathy_la_SOURCES = rpathy.c librpathy_la_LDFLAGS = @LTLIBRPATHX@ -lc -no-undefined diff --git a/autoconf-lib-link/tests/rpathz/Makefile.am b/autoconf-lib-link/tests/rpathz/Makefile.am index e90f44a..675dda2 100644 --- a/autoconf-lib-link/tests/rpathz/Makefile.am +++ b/autoconf-lib-link/tests/rpathz/Makefile.am @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = 1.5 foreign no-dependencies -mkinstalldirs = $(SHELL) @global_top_auxdir@/mkinstalldirs lib_LTLIBRARIES = librpathz.la librpathz_la_SOURCES = rpathz.c librpathz_la_LDFLAGS = @LTLIBRPATHX@ @LTLIBRPATHY@ -lc -no-undefined 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 \ diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index efb2363..8b563b6 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,7 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * Makefile.am (gettextsrc_SCRIPTS): Remove mkinstalldirs. + 2006-03-11 Bruno Haible <bruno@clisp.org> * configure.ac (MSGMERGE_LIBM): New variable. Test for presence of diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index dd7aa35..fb3e148 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2005 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 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 General Public License as published by @@ -28,7 +28,7 @@ EXTRA_DIST = misc/DISCLAIM # Files installed for use by gettextize. gettextsrcdir = $(datadir)/gettext -gettextsrc_SCRIPTS = ../autoconf-lib-link/config.rpath ../build-aux/mkinstalldirs +gettextsrc_SCRIPTS = ../autoconf-lib-link/config.rpath # Files copied from other directories. diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index 1a745a8..6b93a49 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,11 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). + * gettext.texi (config.guess): Don't mention mkinstalldirs file any + more. + (mkinstalldirs): Say it's obsolete. + * gettextize.texi: Don't mention mkinstalldirs. + 2006-04-11 Bruno Haible <bruno@clisp.org> * gpl.texi: New file, from GNU with typesetting modifications. diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am index 125d7bb..6f81e2c 100644 --- a/gettext-tools/doc/Makefile.am +++ b/gettext-tools/doc/Makefile.am @@ -111,11 +111,11 @@ MAINTAINERCLEANFILES = gettext_*.html TEXI2DVI = texi2dvi $(TEXINCLUDES) install-dvi: gettext.dvi - $(mkinstalldirs) $(DESTDIR)$(dvidir) + $(mkdir_p) $(DESTDIR)$(dvidir) $(INSTALL_DATA) `if test -f gettext.dvi; then echo .; else echo $(srcdir); fi`/gettext.dvi $(DESTDIR)$(dvidir)/gettext.dvi installdirs-dvi: - $(mkinstalldirs) $(DESTDIR)$(dvidir) + $(mkdir_p) $(DESTDIR)$(dvidir) uninstall-dvi: $(RM) $(DESTDIR)$(dvidir)/gettext.dvi @@ -144,11 +144,11 @@ gettext.ps: gettext.dvi $(DVIPS) -o $@ `if test -f gettext.dvi; then echo gettext.dvi; else echo $(srcdir)/gettext.dvi; fi` install-ps: gettext.ps - $(mkinstalldirs) $(DESTDIR)$(psdir) + $(mkdir_p) $(DESTDIR)$(psdir) $(INSTALL_DATA) `if test -f gettext.ps; then echo .; else echo $(srcdir); fi`/gettext.ps $(DESTDIR)$(psdir)/gettext.ps installdirs-ps: - $(mkinstalldirs) $(DESTDIR)$(psdir) + $(mkdir_p) $(DESTDIR)$(psdir) uninstall-ps: $(RM) $(DESTDIR)$(psdir)/gettext.ps @@ -162,11 +162,11 @@ TEXI2PDF = @TEXI2PDF@ $(TEXINCLUDES) SUFFIXES = .pdf install-pdf: gettext.pdf - $(mkinstalldirs) $(DESTDIR)$(pdfdir) + $(mkdir_p) $(DESTDIR)$(pdfdir) $(INSTALL_DATA) `if test -f gettext.pdf; then echo .; else echo $(srcdir); fi`/gettext.pdf $(DESTDIR)$(pdfdir)/gettext.pdf installdirs-pdf: - $(mkinstalldirs) $(DESTDIR)$(pdfdir) + $(mkdir_p) $(DESTDIR)$(pdfdir) uninstall-pdf: $(RM) $(DESTDIR)$(pdfdir)/gettext.pdf @@ -193,17 +193,17 @@ gettext_toc.html: gettext.texi version.texi $(gettext_TEXINFOS) esac install-html-monolithic: gettext.html - $(mkinstalldirs) $(DESTDIR)$(htmldir) + $(mkdir_p) $(DESTDIR)$(htmldir) $(INSTALL_DATA) `if test -f gettext.html; then echo .; else echo $(srcdir); fi`/gettext.html $(DESTDIR)$(htmldir)/gettext.html install-html-split: gettext_toc.html - $(mkinstalldirs) $(DESTDIR)$(htmldir) + $(mkdir_p) $(DESTDIR)$(htmldir) for file in `if test -f gettext_toc.html; then echo .; else echo $(srcdir); fi`/gettext_*.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \ done installdirs-html: - $(mkinstalldirs) $(DESTDIR)$(htmldir) + $(mkdir_p) $(DESTDIR)$(htmldir) uninstall-html-monolithic: $(RM) $(DESTDIR)$(htmldir)/gettext.html @@ -212,14 +212,14 @@ uninstall-html-split: $(RM) $(DESTDIR)$(htmldir)/gettext_*.html dist-html-monolithic: - $(mkinstalldirs) $(distdir)/ + $(mkdir_p) $(distdir)/ file=gettext.html; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ cp -p $$d/$$file $(distdir)/$$file || exit 1 # We would like to put gettext_*.html into EXTRA_DIST, but it doesn't work. dist-html-split: - $(mkinstalldirs) $(distdir)/ + $(mkdir_p) $(distdir)/ file=gettext_toc.html; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ for file in `cd $$d && echo gettext_*.html`; do \ diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 6b97e9b..c9d2a9e 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -6773,10 +6773,9 @@ GNU @code{libtool} packages. Normally, @file{config.guess} and @file{config.sub} are put at the top level of a distribution. But it is also possible to put them in a subdirectory, altogether with other configuration support files like -@file{install-sh}, @file{ltconfig}, @file{ltmain.sh}, -@file{mkinstalldirs} or @file{missing}. All you need to do, other than -moving the files, is to add the following line to your -@file{configure.in}. +@file{install-sh}, @file{ltconfig}, @file{ltmain.sh} or @file{missing}. +All you need to do, other than moving the files, is to add the following line +to your @file{configure.in}. @example AC_CONFIG_AUX_DIR([@var{subdir}]) @@ -6786,20 +6785,10 @@ AC_CONFIG_AUX_DIR([@var{subdir}]) @subsection @file{mkinstalldirs} at top level @cindex @file{mkinstalldirs} file -If @code{gettextize} has not already done it, you need to add the GNU -@file{mkinstalldirs} script to your distribution. It is needed because -@samp{mkdir -p} is not portable enough. You find this script in the -GNU @code{automake} distribution. - -Normally, @file{mkinstalldirs} is put at the top level of a distribution. -But it is also possible to put it in a subdirectory, altogether with other -configuration support files like @file{install-sh}, @file{ltconfig}, -@file{ltmain.sh} or @file{missing}. All you need to do, other than -moving the files, is to add the following line to your @file{configure.in}. - -@example -AC_CONFIG_AUX_DIR([@var{subdir}]) -@end example +With earlier versions of GNU gettext, you needed to add the GNU +@file{mkinstalldirs} script to your distribution. This is not needed any +more. You can remove it if you not also using an automake version older than +automake 1.9. @node aclocal, acconfig, mkinstalldirs, Adjusting Files @subsection @file{aclocal.m4} at top level diff --git a/gettext-tools/doc/gettextize.texi b/gettext-tools/doc/gettextize.texi index c4dfd67..e653650 100644 --- a/gettext-tools/doc/gettextize.texi +++ b/gettext-tools/doc/gettextize.texi @@ -129,9 +129,9 @@ distribution. Also, if option @code{--force} (@code{-f}) is given, the @file{intl/} directory is emptied first. @item -The files @file{config.rpath} and @file{mkinstalldirs} are copied into -the directory containing configuration support files. It is needed by -the @code{AM_GNU_GETTEXT} autoconf macro. +The file @file{config.rpath} is copied into the directory containing +configuration support files. It is needed by the @code{AM_GNU_GETTEXT} +autoconf macro. @item Only if the project is using GNU @code{automake}: 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 \ diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 704d050..b94c2a9 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,5 +1,9 @@ 2006-04-17 Bruno Haible <bruno@clisp.org> + * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). + +2006-04-17 Bruno Haible <bruno@clisp.org> + * Makefile.am (byteswap.h): Don't use $(srcdir)/$<, for portability. 2006-04-09 Bruno Haible <bruno@clisp.org> diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am index 3a7142d..8f39619 100644 --- a/gettext-tools/lib/Makefile.am +++ b/gettext-tools/lib/Makefile.am @@ -239,7 +239,7 @@ all-local: charset.alias ref-add.sed ref-del.sed charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp install-exec-local: all-local - test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir) + test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir) if test -f $(charset_alias); then \ sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog index e1017be..4649f46 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/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-tools/man/Makefile.am b/gettext-tools/man/Makefile.am index a1ee0d2..412f903 100644 --- a/gettext-tools/man/Makefile.am +++ b/gettext-tools/man/Makefile.am @@ -185,14 +185,14 @@ autopoint.1.html: autopoint.1 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-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 100ceae..521d7f9 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,8 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * add-to-archive: Remove special handling of mkinstalldirs file. + * gettextize.in: Likewise. + 2006-04-20 Bruno Haible <bruno@clisp.org> * autopoint.in: Update for 0.15. diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/misc/add-to-archive index 2eda76b..f3f1742 100755 --- a/gettext-tools/misc/add-to-archive +++ b/gettext-tools/misc/add-to-archive @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2006 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -64,7 +64,7 @@ work_archive=`pwd`/"$work_dir/archive" case $file in ABOUT-NLS) cp -p $file "$work_archive/$file" ;; - config.rpath | mkinstalldirs) + config.rpath) cp -p $file "$work_archive/$file" ;; esac done diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 3f8e16c..1d231b5 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -291,7 +291,7 @@ if test $force -eq 0; then fi fi -# Check in which directory config.rpath, mkinstalldirs etc. belong. +# Check in which directory config.rpath etc. belong. auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` if test -n "$auxdir"; then auxdir="$auxdir/" @@ -576,7 +576,7 @@ test -d "$srcdir/po" || { added_directories="$added_directories po" } -# Create the directory for config.rpath, mkinstalldirs, if needed. +# Create the directory for config.rpath, if needed. # This is for consistency with autoreconf and automake. # Note that $auxdir is either empty or ends in a slash. test -d "$srcdir/$auxdir" || { @@ -594,7 +594,7 @@ for file in *; do ABOUT-NLS) func_linkorcopy $file "$gettext_dir/$file" $file ;; - config.rpath | mkinstalldirs) + config.rpath) if test -f "$srcdir/$auxdir$file"; then : else diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index bcee7f7..2ed1815 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/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-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index 0fd7072..a059a03 100644 --- a/gettext-tools/po/Makefile.in.in +++ b/gettext-tools/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 \ diff --git a/gettext-tools/projects/ChangeLog b/gettext-tools/projects/ChangeLog index e4e61a6..20611fc 100644 --- a/gettext-tools/projects/ChangeLog +++ b/gettext-tools/projects/ChangeLog @@ -1,3 +1,7 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). + 2005-08-05 Bruno Haible <bruno@clisp.org> * GNOME/teams.html: Update. diff --git a/gettext-tools/projects/Makefile.am b/gettext-tools/projects/Makefile.am index d1b742d..a105089 100644 --- a/gettext-tools/projects/Makefile.am +++ b/gettext-tools/projects/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/projects subdirectory of GNU gettext -## Copyright (C) 2001-2003 Free Software Foundation, Inc. +## Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -37,10 +37,10 @@ DATAFILES = index \ EXTRA_DIST += $(SCRIPTFILES) $(DATAFILES) install-data-local: - $(mkinstalldirs) $(DESTDIR)$(projectsdir) + $(mkdir_p) $(DESTDIR)$(projectsdir) @for p in $(PROJECTS); do \ - echo "$(mkinstalldirs) $(DESTDIR)$(projectsdir)/$$p"; \ - $(mkinstalldirs) $(DESTDIR)$(projectsdir)/$$p; \ + echo "$(mkdir_p) $(DESTDIR)$(projectsdir)/$$p"; \ + $(mkdir_p) $(DESTDIR)$(projectsdir)/$$p; \ done @for f in $(SCRIPTFILES); do \ echo "$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(projectsdir)/$$f"; \ @@ -52,10 +52,10 @@ install-data-local: done installdirs-local: - $(mkinstalldirs) $(DESTDIR)$(projectsdir) + $(mkdir_p) $(DESTDIR)$(projectsdir) @for p in $(PROJECTS); do \ - echo "$(mkinstalldirs) $(DESTDIR)$(projectsdir)/$$p"; \ - $(mkinstalldirs) $(DESTDIR)$(projectsdir)/$$p; \ + echo "$(mkdir_p) $(DESTDIR)$(projectsdir)/$$p"; \ + $(mkdir_p) $(DESTDIR)$(projectsdir)/$$p; \ done uninstall-local: diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index af3474d..2cb3e51 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,7 @@ +2006-04-17 Bruno Haible <bruno@clisp.org> + + * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). + 2006-04-09 Bruno Haible <bruno@clisp.org> * write-csharp.c: Include clean-temp.h. Don't include unistd.h, diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index c0d5bf3..85a82ce 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -321,14 +321,14 @@ po-gram-gen2.h: po-gram-gen.h # Special rules for installation of auxiliary programs. install-exec-local: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) hostname$(EXEEXT) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT) $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) urlget$(EXEEXT) $(DESTDIR)$(pkglibdir)/urlget$(EXEEXT) $(INSTALL_SCRIPT) user-email $(DESTDIR)$(pkglibdir)/user-email $(INSTALL_SCRIPT) $(srcdir)/project-id $(DESTDIR)$(pkglibdir)/project-id installdirs-local: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) uninstall-local: $(RM) $(DESTDIR)$(pkglibdir)/hostname$(EXEEXT) @@ -373,7 +373,7 @@ CLEANFILES += gnu.gettext.DumpResource$(EXEEXT) gnu.gettext.GetURL$(EXEEXT) \ install-exec-local: install-exec-java-@BUILDJAVAEXE@ install-exec-java-yes: all-java-yes - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gnu.gettext.DumpResource$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.DumpResource$(EXEEXT) $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gnu.gettext.GetURL$(EXEEXT) $(DESTDIR)$(pkglibdir)/gnu.gettext.GetURL$(EXEEXT) install-exec-java-no: @@ -387,10 +387,10 @@ install-data-java-no-no: installdirs-local: installdirs-java-@BUILDJAVAEXE@ installdirs-java-yes: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) installdirs-java-no: installdirs-java-no-@BUILDJAVA@ installdirs-java-no-yes: - $(mkinstalldirs) $(DESTDIR)$(jardir) + $(mkdir_p) $(DESTDIR)$(jardir) installdirs-java-no-no: uninstall-local: uninstall-java-@BUILDJAVAEXE@ @@ -421,15 +421,15 @@ msgunfmt.net.exe: msgunfmt.cs install-exec-local: install-exec-csharp-@BUILDCSHARP@ install-exec-csharp-yes: all-csharp-yes - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) $(INSTALL_DATA) msgfmt.net.exe $(DESTDIR)$(pkglibdir)/msgfmt.net.exe $(INSTALL_DATA) msgunfmt.net.exe $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe install-exec-csharp-no: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) installdirs-local: install-csharp installdirs-csharp: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkdir_p) $(DESTDIR)$(pkglibdir) uninstall-local: uninstall-csharp-@BUILDCSHARP@ uninstall-csharp-yes: all-csharp-yes @@ -444,12 +444,12 @@ EXTRA_DIST += msgunfmt.tcl install-data-local: install-tcl install-tcl: - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(mkdir_p) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl installdirs-local: installdirs-tcl installdirs-tcl: - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(mkdir_p) $(DESTDIR)$(pkgdatadir) uninstall-local: uninstall-tcl uninstall-tcl: |