Browse files

* Makefile.in (install-lisp, install-icons, install-icons30): Quote d…

…irectory

 name that might contain whitespace.

* doc/Makefile.in (install): Ditto.

* aclocal.m4 (AC_PATH_LISPDIR): Ditto; always report prefix name.

* mkinstalldirs: Replace it with the 2006-05-11.19 version.
  • Loading branch information...
1 parent a9f5020 commit 4aa3a083217eedde91470a90b99c4351a97681bc yamaoka committed Feb 6, 2008
Showing with 174 additions and 59 deletions.
  1. +23 −23 Makefile.in
  2. +7 −6 aclocal.m4
  3. +8 −8 doc/Makefile.in
  4. +136 −22 mkinstalldirs
View
46 Makefile.in
@@ -62,64 +62,64 @@ install-en: install-lisp install-info-en
install-ja: install-lisp install-info-ja
install-lisp: lisp
- @$(SHELL) $(srcdir)/mkinstalldirs $(lispdir);\
+ @$(SHELL) $(srcdir)/mkinstalldirs "$(lispdir)";\
for p in ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9] *.el; do\
if test -f "$$p"; then\
case "$$p" in\
$(IGNORES)) ;;\
w3m-ems\.el) if test -z "$(XEMACSDEBUG)"; then\
- echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
- $(INSTALL_DATA) $$p $(lispdir)/$$p; fi;;\
+ echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\"";\
+ $(INSTALL_DATA) $$p "$(lispdir)/$$p"; fi;;\
w3m-xmas\.el) if test -n "$(XEMACSDEBUG)"; then\
- echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
- $(INSTALL_DATA) $$p $(lispdir)/$$p; fi;;\
- *) echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
- $(INSTALL_DATA) $$p $(lispdir)/$$p;;\
+ echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\"";\
+ $(INSTALL_DATA) $$p "$(lispdir)/$$p"; fi;;\
+ *) echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\"";\
+ $(INSTALL_DATA) $$p "$(lispdir)/$$p";;\
esac;\
fi;\
done;\
for p in *.elc; do\
if test -f "$$p"; then\
- echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
- $(INSTALL_DATA) $$p $(lispdir)/$$p;\
+ echo "$(INSTALL_DATA) $$p \"$(lispdir)/$$p\"";\
+ $(INSTALL_DATA) $$p "$(lispdir)/$$p";\
fi;\
done;\
if test -f shimbun/shimbun.elc; then\
for p in `cd shimbun && echo ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9]`; do\
if test -f "shimbun/$$p"; then\
- echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/s$$p";\
- $(INSTALL_DATA) shimbun/$$p $(lispdir)/s$$p;\
+ echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/s$$p\"";\
+ $(INSTALL_DATA) shimbun/$$p "$(lispdir)/s$$p";\
fi;\
done;\
for p in `cd shimbun && echo *.el`; do\
- echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\
- $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\
+ echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/$$p\"";\
+ $(INSTALL_DATA) shimbun/$$p "$(lispdir)/$$p";\
done;\
for p in `cd shimbun && echo *.elc`; do\
- echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\
- $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\
+ echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/$$p\"";\
+ $(INSTALL_DATA) shimbun/$$p "$(lispdir)/$$p";\
done;\
fi
install-icons:
- @if test $(ICONDIR) = NONE; then\
+ @if test "$(ICONDIR)" = NONE; then\
echo "You don't have to install icon files for \"$(EMACS)\".";\
else\
- $(SHELL) $(srcdir)/mkinstalldirs $(ICONDIR);\
+ $(SHELL) $(srcdir)/mkinstalldirs "$(ICONDIR)";\
for i in `cd icons && echo *.gif *.png *.xpm`; do\
- echo " $(INSTALL_DATA) icons/$$i $(ICONDIR)/$$i";\
- $(INSTALL_DATA) icons/$$i $(ICONDIR)/$$i;\
+ echo "$(INSTALL_DATA) icons/$$i \"$(ICONDIR)/$$i\"";\
+ $(INSTALL_DATA) icons/$$i "$(ICONDIR)/$$i";\
done;\
fi
install-icons30:
- @if test $(ICONDIR) = NONE; then\
+ @if test "$(ICONDIR)" = NONE; then\
echo "You don't have to install icon files for \"$(EMACS)\".";\
else\
- $(SHELL) $(srcdir)/mkinstalldirs $(ICONDIR);\
+ $(SHELL) $(srcdir)/mkinstalldirs "$(ICONDIR)";\
for i in `cd icons30 && echo *.gif *.png *.xpm`; do\
- echo " $(INSTALL_DATA) icons30/$$i $(ICONDIR)/$$i";\
- $(INSTALL_DATA) icons30/$$i $(ICONDIR)/$$i;\
+ echo "$(INSTALL_DATA) icons30/$$i \"$(ICONDIR)/$$i\"";\
+ $(INSTALL_DATA) icons30/$$i "$(ICONDIR)/$$i";\
done;\
fi
View
13 aclocal.m4
@@ -197,27 +197,28 @@ AC_DEFUN(AC_PATH_LISPDIR, [
else
tribe=${EMACS_FLAVOR}
fi
- if test ${prefix} = NONE; then
- AC_MSG_CHECKING([prefix for ${EMACS}])
+ AC_MSG_CHECKING([prefix for ${EMACS}])
+ if test "${prefix}" = NONE; then
AC_EMACS_LISP(prefix,(expand-file-name \"..\" invocation-directory),noecho)
prefix=${EMACS_cv_SYS_prefix}
- AC_MSG_RESULT(${prefix})
fi
+ AC_MSG_RESULT(${prefix})
AC_ARG_WITH(lispdir,
[ --with-lispdir=DIR where lisp files should go
(use --with-packagedir for XEmacs package)],
lispdir="${withval}")
AC_MSG_CHECKING([where lisp files should go])
if test -z "${lispdir}"; then
dnl Set the default value.
- theprefix=${prefix}
- if test x${theprefix} = xNONE; then
+ theprefix="${prefix}"
+ if test "${theprefix}" = NONE; then
theprefix=${ac_default_prefix}
fi
lispdir="\$(datadir)/${tribe}/site-lisp/w3m"
for thedir in share lib; do
potential=
- if test -d ${theprefix}/${thedir}/${tribe}/site-lisp; then
+ dnl The directory name should be quoted because it might contain spaces.
+ if test -d "${theprefix}/${thedir}/${tribe}/site-lisp"; then
lispdir="\$(prefix)/${thedir}/${tribe}/site-lisp/w3m"
break
fi
View
16 doc/Makefile.in
@@ -68,25 +68,25 @@ emacs-w3m-ja.info: version.texi emacs-w3m-ja.texi
esac
install: $(INFO_DEPS)
- $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
+ $(SHELL) $(top_srcdir)/mkinstalldirs "$(infodir)"
@for file in $(INFO_DEPS); do\
if test -f $$file; then\
- for old in `cd $(infodir) && echo $$file-[0-9]`; do\
+ for old in `cd "$(infodir)" && echo $$file-[0-9]`; do\
if test -f "$(infodir)/$$old"; then\
- echo " rm -f $(infodir)/$$old";\
+ echo "rm -f \"$(infodir)/$$old\"";\
rm -f "$(infodir)/$$old";\
fi;\
done;\
- echo " $(INSTALL_DATA) $$file $(infodir)/$$file";\
- $(INSTALL_DATA) $$file $(infodir)/$$file;\
+ echo "$(INSTALL_DATA) $$file \"$(infodir)/$$file\"";\
+ $(INSTALL_DATA) $$file "$(infodir)/$$file";\
else : ; fi;\
done
@if $(SHELL) -c $(INSTALL_INFO)' --version| sed 1q\
| fgrep -s -v -i debian'>/dev/null 2>&1; then\
for file in $(INFO_DEPS); do\
- if test -f $(infodir)/$$file; then\
- echo " $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file";\
- $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file || :;\
+ if test -f "$(infodir)/$$file"; then\
+ echo "$(INSTALL_INFO) --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
+ $(INSTALL_INFO) --info-dir="$(infodir)" "$(infodir)/$$file" || :;\
else : ; fi\
done;\
else : ; fi
View
158 mkinstalldirs
@@ -1,38 +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
+ 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
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
+ case $file in
+ /*) pathcomp=/ ;;
+ *) pathcomp= ;;
+ esac
+ oIFS=$IFS
+ IFS=/
+ set fnord $file
+ shift
+ IFS=$oIFS
+
+ for d
+ do
+ test "x$d" = x && continue
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
+ pathcomp=$pathcomp$d
+ case $pathcomp in
+ -*) pathcomp=./$pathcomp ;;
+ esac
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
- mkdir "$pathcomp" || lasterr=$?
+ mkdir "$pathcomp" || lasterr=$?
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
- fi
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+ lasterr=
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- pathcomp="$pathcomp/"
- done
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
+ fi
+
+ pathcomp=$pathcomp/
+ done
done
exit $errstatus
-
-# mkinstalldirs ends here

0 comments on commit 4aa3a08

Please sign in to comment.