[Emacs-diffs] /srv/bzr/emacs/trunk r103725: Replace mkinstalldirs with `install-sh -d', as automake recommends.

[Glenn Morris]

------------------------------------------------------------
revno: 103725
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-22 20:09:55 -0700
message:
  Replace mkinstalldirs with `install-sh -d', as automake recommends.
  
  * Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
  (sync-from-gnulib): Don't sync mkinstalldirs.
  
  * make-dist: Don't distribute mkinstalldirs.
  
  * leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.
  
  * lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
  Use `install-sh -d' rather than mkinstalldirs.
  
  * configure.in, doc/emacs/Makefile.in: Update comments.
  
  * admin/notes/copyright: Remove mkinstalldirs.
removed:
  mkinstalldirs
modified:
  ChangeLog
  Makefile.in
  admin/notes/copyright
  configure.in
  doc/emacs/Makefile.in
  leim/ChangeLog
  leim/Makefile.in
  lib-src/ChangeLog
  lib-src/Makefile.in
  make-dist

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-03-23 01:01:59 +0000
+++ b/ChangeLog 2011-03-23 03:09:55 +0000
@@ -1,3 +1,9 @@
+2011-03-23  Glenn Morris  <address@hidden>
+
+       * Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs.
+       (sync-from-gnulib): Don't sync mkinstalldirs.
+       * make-dist: Don't distribute mkinstalldirs.
+
 2011-03-23  Paul Eggert  <address@hidden>
 
        Fix more problems found by GCC 4.5.2's static checks.

=== modified file 'Makefile.in'
--- a/Makefile.in       2011-03-21 05:34:48 +0000
+++ b/Makefile.in       2011-03-23 03:09:55 +0000
@@ -347,7 +347,6 @@
          $(gnulib_srcdir)/build-aux/config.sub \
          $(gnulib_srcdir)/build-aux/config.guess \
          $(gnulib_srcdir)/build-aux/install-sh \
-         $(gnulib_srcdir)/build-aux/mkinstalldirs \
          $(gnulib_srcdir)/build-aux/move-if-change \
          $(srcdir)
        cd $(srcdir) && autoreconf -I m4
@@ -678,7 +677,7 @@
 
 ### Build all the directories we're going to install Emacs in. Since
 ### we may be creating several layers of directories (for example,
-### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
+### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use install-sh -d
 ### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
 ### We set the umask so that any created directories are world-readable.
 ### FIXME it would be good to warn about non-standard permissions of
@@ -692,7 +691,7 @@
        done ; \
        icondirs=`echo "$${icondirs}" | sed 
's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
        umask 022 ; \
-       $(srcdir)/mkinstalldirs $(DESTDIR)${datadir} ${COPYDESTS} \
+       $(srcdir)/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
          $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
          $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
          $(DESTDIR)${datadir}/emacs/site-lisp \

=== modified file 'admin/notes/copyright'
--- a/admin/notes/copyright     2011-02-18 08:07:03 +0000
+++ b/admin/notes/copyright     2011-03-23 03:09:55 +0000
@@ -143,10 +143,6 @@
 install-sh
  - this file is copyright MIT, which is OK. Leave the copyright alone.
 
-mkinstalldirs
-src/m/news-r6.h
-  public domain, leave alone.
-
 etc/refcards/*.tex
   also update the \def\year macro for the latest year.
 

=== modified file 'configure.in'
--- a/configure.in      2011-03-21 05:34:48 +0000
+++ b/configure.in      2011-03-23 03:09:55 +0000
@@ -1359,7 +1359,7 @@
       DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d'
       ## In parallel builds, another make might create depdir between
       ## the first test and mkdir, so stick another test on the end.
-      ## Or use mkinstalldirs?  mkdir -p is not portable.
+      ## Or use install-sh -d?  mkdir -p is not portable.
       MKDEPDIR='test -d ${DEPDIR} || mkdir ${DEPDIR} || test -d ${DEPDIR}'
       deps_frag=autodeps.mk
    fi

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2011-03-08 08:59:18 +0000
+++ b/doc/emacs/Makefile.in     2011-03-23 03:09:55 +0000
@@ -111,7 +111,7 @@
 
 ## This seems pointless.  The info/ directory exists in both the
 ## repository and the release tarfiles.  We do not use any
-## equivalent of mkdir -p/mkinstalldirs, so this is not a general
+## equivalent of mkdir -p/install-sh -d, so this is not a general
 ## solution anyway.  The second test -d is for parallel builds.
 mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2011-03-12 19:19:47 +0000
+++ b/leim/ChangeLog    2011-03-23 03:09:55 +0000
@@ -1,3 +1,7 @@
+2011-03-23  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs.
+
 2011-02-28  Juanma Barranquero  <address@hidden>
 
        * quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2011-01-28 01:51:41 +0000
+++ b/leim/Makefile.in  2011-03-23 03:09:55 +0000
@@ -220,7 +220,7 @@
 
 install: all
        if [ ! -d ${INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \
+          umask 022; ${srcdir}/../install-sh -d ${INSTALLDIR}; \
        else true; fi
        if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
          rm -f ${INSTALLDIR}/leim-list.el; \

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-03-23 01:01:59 +0000
+++ b/lib-src/ChangeLog 2011-03-23 03:09:55 +0000
@@ -1,3 +1,8 @@
+2011-03-23  Glenn Morris  <address@hidden>
+
+       * Makefile.in ($(DESTDIR)${archlibdir}):
+       Use `install-sh -d' rather than mkinstalldirs.
+
 2011-03-23  Paul Eggert  <address@hidden>
 
        * ebrowse.c: Use size_t, not int, for sizes.

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2011-03-21 05:04:41 +0000
+++ b/lib-src/Makefile.in       2011-03-23 03:09:55 +0000
@@ -235,13 +235,13 @@
 $(DESTDIR)${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
-       umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir}
+       umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir}
        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file 
$(DESTDIR)${archlibdir}/$$file ; \
          done ; \
         fi
-       umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \
+       umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${gamedir}; \
        touch $(DESTDIR)${gamedir}/snake-scores; \
        touch $(DESTDIR)${gamedir}/tetris-scores
        -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && 
chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \

=== modified file 'make-dist'
--- a/make-dist 2011-02-13 02:04:18 +0000
+++ b/make-dist 2011-03-23 03:09:55 +0000
@@ -286,7 +286,7 @@
 ln INSTALL README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in configure configure.in ${tempdir}
 ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
-ln mkinstalldirs config.sub config.guess install-sh ${tempdir}
+ln config.sub config.guess install-sh ${tempdir}
 ln aclocal.m4 ${tempdir}
 ln compile depcomp missing ${tempdir}
 ln arg-nonnull.h c++defs.h warn-on-use.h ${tempdir}

=== removed file 'mkinstalldirs'
--- a/mkinstalldirs     2011-01-07 20:42:11 +0000
+++ b/mkinstalldirs     1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <address@hidden>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <address@hidden> or send patches to
-# <address@hidden>.
-
-nl='
-'
-IFS=" ""       $nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <address@hidden>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # 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
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    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
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End: