Convert from using mkinstalldirs to $(MKDIR_P).

The automake mkinstalldirs script is now deprecated. "install-sh -d"
can be used in place.  Configure.ac already includes AC_PROG_INSTALL,
which will ensure install-sh is bundled.  Add AC_PROG_MKDIR_P, which
will set $(MKDIR_P) to either a thread-safe "mkdir -p" or will fall back
to using install-sh.

diff --git a/Makefile.am b/Makefile.am
index 021e737b7ab1df5852f94d9b2efc72574d87b145..8ac3a0a451acf0f18f605eb9b707fbbfda18aaa1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,7 +162,7 @@ install-exec-hook:
        fi
 
 install-data-local:
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)
        $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
        -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
                $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \

diff --git a/configure.ac b/configure.ac
index c867af17fc77465a7a8449ce4fd16318109be131..e0d6814a6f0e8c50f1aac9070ec7db745862e1d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ fi
 AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 AC_PROG_RANLIB
 AC_CHECK_TOOL(AR, ar, ar)
 

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f6e67d42f00c951b4463139ea210c79bafcf9bf4..4abd2c7c23e6e1cfce50dd59115bbf43cf429117 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = language.txt language50.txt  \
        iconv/make.sh
 
 install-data-local:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
+       $(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
        for f in $(SAMPLES) ; do \
                $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;   \
        done

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 42d918a477601b3c40364ab6aaa9f8b0d6dedb28..25633760cd05baa1c0c1d082a76d6c1d8022c55c 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -53,9 +53,9 @@ all: makedoc-all
 makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 pgpring.1
 
 install-data-local: makedoc-all instdoc
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+       $(MKDIR_P) $(DESTDIR)$(mandir)/man1
+       $(MKDIR_P) $(DESTDIR)$(mandir)/man5
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)
        ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
        ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
        ./instdoc pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
@@ -67,7 +67,7 @@ install-data-local: makedoc-all instdoc
        ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
        ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
        ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+       $(MKDIR_P) $(DESTDIR)$(docdir)
        for f in $(topsrcdir_DOCFILES) ; do \
                $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
        done

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 6ad1204aa236c9820d931cf656c6f29ac3110a8c..c16a47807c815fe8ca01678a3aa007b8fb22fa3b 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -40,8 +40,7 @@ subdir = intl
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+MKDIR_P = @MKDIR_P@
 
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
@@ -145,7 +144,7 @@ install: install-exec install-data
 install-exec: all
        if test "$(PACKAGE)" = "gettext" \
           && test '@INTLOBJS@' = '$(GETTOBJS)'; 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; \
@@ -153,7 +152,7 @@ install-exec: all
          : ; \
        fi
        if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-         $(mkinstalldirs) $(DESTDIR)$(libdir); \
+         $(MKDIR_P) $(DESTDIR)$(libdir); \
          temp=$(DESTDIR)$(libdir)/t-charset.alias; \
          dest=$(DESTDIR)$(libdir)/charset.alias; \
          if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -169,7 +168,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; \
@@ -183,7 +182,7 @@ install-exec: all
        fi
 install-data: all
        if test "$(PACKAGE)" = "gettext"; 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 COPYING.LIB-2.1 $(DISTFILES.common)"; \

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index a7d87fd1d5d7a15531ef71887b2294374d3a16fe..b6d1648b4142fe33506a95a2516df59bd47b89b9 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -358,18 +358,6 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
      fi
    fi
 
-   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 is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
    dnl Enable libtool support if the surrounding package wishes it.
    INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 0cf0fe74b5ff605b76c0356cdcff0cc8d0756a9d..c1b0b2c7a30edec520d27823484f284737590779 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -29,8 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+MKDIR_P = @MKDIR_P@
 
 CC = @CC@
 GMSGFMT = @GMSGFMT@
@@ -107,7 +106,7 @@ install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
        if test "$(PACKAGE)" = "gettext"; then \
-         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+         $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
                          $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
        else \
@@ -115,13 +114,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 's/\.gmo$$//'`; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
-         $(mkinstalldirs) $(DESTDIR)$$dir; \
+         $(MKDIR_P) $(DESTDIR)$$dir; \
          if test -r $$cat; then \
            $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
            echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \