* GNUS-NEWS: Generated.

* Makefile.in (datarootdir): Define.

* aclocal.m4 (AC_PATH_LISPDIR): Quote directory name that might contain
 whitespace.

* configure: Regenerate.

* mkinstalldirs: Replace it with the 2006-05-11.19 version.

diff --git a/ChangeLog b/ChangeLog
index be5de83..e5a38ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * GNUS-NEWS: Generated.
+
+       * Makefile.in (datarootdir): Define.
+
+       * aclocal.m4 (AC_PATH_LISPDIR): Quote directory name that might contain
+       whitespace.
+
+       * configure: Regenerate.
+
+       * mkinstalldirs: Replace it with the 2006-05-11.19 version.
+
 2008-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * GNUS-NEWS: Generated.
@@ -779,7 +792,7 @@
        Windows NT.
 
     Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-    2007 Free Software Foundation, Inc.
+    2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 

diff --git a/GNUS-NEWS b/GNUS-NEWS
index 5e41dd0..b294643 100644 (file)
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -1,7 +1,7 @@
 GNUS NEWS -- history of user-visible changes.
 
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008 Free Software Foundation, Inc.
+   2006, 2007, 2008  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
@@ -27,6 +27,8 @@ installer issues a warning if other Gnus installations which will shadow
 the latest one are detected.  You can then remove those shadows manually
 or remove them using `make remove-installed-shadows'.
 
+** The installation directory name is allowed to have spaces and/or tabs.
+
 \f
 * New packages and libraries within Gnus
 

diff --git a/Makefile.in b/Makefile.in
index be44dec..9a613be 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,5 @@
 prefix = @prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 lispdir = @lispdir@
 srcdir = @srcdir@

diff --git a/aclocal.m4 b/aclocal.m4
index 3566926..78a0158 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -91,7 +91,8 @@ AC_DEFUN(AC_PATH_LISPDIR, [
     fi
     for thedir in share lib; do
        potential=
-       if test -d ${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp; then
+       dnl The directory name should be quoted because it might contain spaces.
+       if test -d "${theprefix}/${thedir}/${EMACS_FLAVOR}/site-lisp"; then
            if test "$EMACS_FLAVOR" = "xemacs"; then
               lispdir="\$(prefix)/${thedir}/${EMACS_FLAVOR}/site-packages/lisp/gnus"
            else

diff --git a/mkinstalldirs b/mkinstalldirs
index 149a038..ba4580c 100755 (executable)
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,36 +1,152 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2006-05-11.19
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
+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 <bug-automake@gnu.org>."
+
+# 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
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
+  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
 
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
 
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
+      mkdir "$pathcomp" || lasterr=$?
 
-        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 ! -d "$pathcomp"; then
-         errstatus=$lasterr
-        fi
-     fi
+         if test ! -z "$lasterr"; then
+           errstatus=$lasterr
+         fi
+       fi
+      fi
+    fi
 
-     pathcomp="$pathcomp/"
-   done
+    pathcomp=$pathcomp/
+  done
 done
 
 exit $errstatus