changeset: 6460:97ef326274e7 user: Kevin McCarthy <ke...@8t8.us> date: Thu Jul 02 11:21:19 2015 -0700 link: http://dev.mutt.org/hg/mutt/rev/97ef326274e7
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. changeset: 6461:39422ec14f60 user: Kevin McCarthy <ke...@8t8.us> date: Thu Jul 02 11:21:22 2015 -0700 link: http://dev.mutt.org/hg/mutt/rev/39422ec14f60 Remove the automake mkinstalldirs script. Add to .hgignore so it doesn't accidentally get added again. diffs (295 lines): diff -r 67d945e38074 -r 39422ec14f60 .hgignore --- a/.hgignore Thu Jul 02 11:18:42 2015 -0700 +++ b/.hgignore Thu Jul 02 11:21:22 2015 -0700 @@ -17,6 +17,7 @@ ^depcomp$ ^install-sh$ ^missing$ +^mkinstalldirs$ # built objects ^flea$ diff -r 67d945e38074 -r 39422ec14f60 Makefile.am --- a/Makefile.am Thu Jul 02 11:18:42 2015 -0700 +++ b/Makefile.am Thu Jul 02 11:21:22 2015 -0700 @@ -162,7 +162,7 @@ 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 -r 67d945e38074 -r 39422ec14f60 configure.ac --- a/configure.ac Thu Jul 02 11:18:42 2015 -0700 +++ b/configure.ac Thu Jul 02 11:21:22 2015 -0700 @@ -35,6 +35,7 @@ AC_PROG_CPP AC_PROG_MAKE_SET AC_PROG_INSTALL +AC_PROG_MKDIR_P AC_PROG_RANLIB AC_CHECK_TOOL(AR, ar, ar) diff -r 67d945e38074 -r 39422ec14f60 contrib/Makefile.am --- a/contrib/Makefile.am Thu Jul 02 11:18:42 2015 -0700 +++ b/contrib/Makefile.am Thu Jul 02 11:21:22 2015 -0700 @@ -14,7 +14,7 @@ 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 -r 67d945e38074 -r 39422ec14f60 doc/Makefile.am --- a/doc/Makefile.am Thu Jul 02 11:18:42 2015 -0700 +++ b/doc/Makefile.am Thu Jul 02 11:21:22 2015 -0700 @@ -53,9 +53,9 @@ 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 @@ ./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 -r 67d945e38074 -r 39422ec14f60 intl/Makefile.in --- a/intl/Makefile.in Thu Jul 02 11:18:42 2015 -0700 +++ b/intl/Makefile.in Thu Jul 02 11:21:22 2015 -0700 @@ -40,8 +40,7 @@ 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-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 @@ : ; \ 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 @@ 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 @@ 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 -r 67d945e38074 -r 39422ec14f60 m4/gettext.m4 --- a/m4/gettext.m4 Thu Jul 02 11:18:42 2015 -0700 +++ b/m4/gettext.m4 Thu Jul 02 11:21:22 2015 -0700 @@ -358,18 +358,6 @@ 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 -r 67d945e38074 -r 39422ec14f60 mkinstalldirs --- a/mkinstalldirs Thu Jul 02 11:18:42 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman <fried...@prep.ai.mit.edu> -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here diff -r 67d945e38074 -r 39422ec14f60 po/Makefile.in.in --- a/po/Makefile.in.in Thu Jul 02 11:18:42 2015 -0700 +++ b/po/Makefile.in.in Thu Jul 02 11:21:22 2015 -0700 @@ -29,8 +29,7 @@ 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-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 @@ 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"; \
