Progress towards allowing installation in directories with whitespace

* Makefile.in (COPYDESTS, write_subdir, install-arch-dep)
(install-arch-indep, install-etcdoc, install-info, install-man)
(install-etc, uninstall): Quote entities that might contain whitespace.

* build-aux/update-subdirs: Handle whitespace in argument.
Check cd return value.

* doc/emacs/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/lispintro/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/lispref/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/misc/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install)
(uninstall): Quote entities that might contain whitespace.

* nt/Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall):
Quote entities that might contain whitespace.

1 files changed, 78 insertions, 77 deletions

diff --git a/Makefile.in b/Makefile.in
index 25e170200a..aa3ade158e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -284,7 +284,7 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
 # separately.  quail appears twice because in out-of-tree builds, it
 # exists twice.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail
-COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail
+COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}/ja-dic" "$(DESTDIR)${leimdir}/quail" "$(DESTDIR)${leimdir}/quail"
 
 all: ${SUBDIR}
 
@@ -469,32 +469,32 @@ install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR)
 ## world-readable.
 ## TODO it might be good to warn about non-standard permissions of
 ## pre-existing directories, but that does not seem easy.
-write_subdir=if [ -f $${subdir}/subdirs.el ]; \
+write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
 	then true; \
 	else \
 	  umask 022; \
-	  ${MKDIR_P} $${subdir}; \
+	  ${MKDIR_P} "$${subdir}"; \
 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
-	    > $${subdir}/subdirs.el; \
+	    > "$${subdir}/subdirs.el"; \
 	fi
 
 ### Install the executables that were compiled specifically for this machine.
 ### We do install-arch-indep first because the executable needs the
 ### Lisp files and DOC file to work properly.
 install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
-	umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
+	umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
 	cd lib-src && \
 	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
 	    exec_prefix=${exec_prefix} bindir=${bindir} \
 	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
 	    INSTALL_STRIP=${INSTALL_STRIP}
 	if test "${ns_self_contained}" = "no"; then \
-	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \
-	  chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
+	  ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
+	  chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
 	  if test "x${NO_BIN_LINK}" = x; then \
-	    rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
-	    cd $(DESTDIR)${bindir} && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
+	    rm -f "$(DESTDIR)${bindir}/$(EMACS)" ; \
+	    cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
 	  fi; \
 	else \
 	  subdir=${ns_appresdir}/site-lisp; \
@@ -568,62 +568,63 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
 	$(set_installuser); \
 	for dir in ${COPYDIR} ; do \
 	  [ -d $${dir} ] || exit 1 ; \
-	  dest=$$1 ; shift ; \
-	  [ -d $${dest} ] && \
-	    [ "`cd $${dest} && /bin/pwd`" = "`cd $${dir} && /bin/pwd`" ] && \
+	  dest="$$1" ; shift ; \
+	  [ -d "$${dest}" ] && \
+	    [ "`cd \"$${dest}\" && /bin/pwd`" = "`cd $${dir} && /bin/pwd`" ] && \
 	    continue ; \
 	  if [ "$${dir}" = "leim/quail" ]; then \
 	    [ "`cd $${dir} && /bin/pwd`" = "`cd ${srcdir}/leim/quail && /bin/pwd`" ] && \
 	      continue ; \
 	  else \
-	    rm -rf $${dest} ; \
-	    umask 022; ${MKDIR_P} $${dest} ; \
+	    rm -rf "$${dest}" ; \
+	    umask 022; ${MKDIR_P} "$${dest}" ; \
 	  fi ; \
 	  echo "Copying $${dir} to $${dest}..." ; \
 	  (cd $${dir}; tar -chf - . ) \
-	    | (cd $${dest}; umask 022; \
+	    | (cd "$${dest}"; umask 022; \
 	       tar -xvf - && cat > /dev/null) || exit 1; \
 	  if [ "$${dir}" = "${srcdir}/etc" ]; then \
-	      rm -f $${dest}/DOC* ; \
-	      rm -f $${dest}/refcards/*.aux $${dest}/refcards/*.dvi; \
-	      rm -f $${dest}/refcards/*.log; \
+	      rm -f "$${dest}/DOC"* ; \
+	      rm -f "$${dest}/refcards"/*.aux "$${dest}/refcards"/*.dvi; \
+	      rm -f "$${dest}/refcards"/*.log; \
 	  else true; \
 	  fi; \
-	  for subdir in `find $${dest} -type d -print` ; do \
-	    chmod a+rx $${subdir} ; \
-	    rm -f $${subdir}/.gitignore ; \
-	    rm -f $${subdir}/.arch-inventory ; \
-	    rm -f $${subdir}/.DS_Store ; \
-	    rm -f $${subdir}/\#* ; \
-	    rm -f $${subdir}/.\#* ; \
-	    rm -f $${subdir}/*~ ; \
-	    rm -f $${subdir}/*.orig ; \
-	    rm -f $${subdir}/ChangeLog* ; \
-	    [ "$${dir}" != "${srcdir}/etc" ] && \
-	      rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
-	  done ; \
-	  find $${dest} -exec chown $${installuser} {} ';' ;\
+	  (cd "$${dest}" || exit 1; \
+	    for subdir in `find . -type d -print` ; do \
+	      chmod a+rx $${subdir} ; \
+	      rm -f $${subdir}/.gitignore ; \
+	      rm -f $${subdir}/.arch-inventory ; \
+	      rm -f $${subdir}/.DS_Store ; \
+	      rm -f $${subdir}/\#* ; \
+	      rm -f $${subdir}/.\#* ; \
+	      rm -f $${subdir}/*~ ; \
+	      rm -f $${subdir}/*.orig ; \
+	      rm -f $${subdir}/ChangeLog* ; \
+	      [ "$${dir}" != "${srcdir}/etc" ] && \
+	        rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
+	    done ); \
+	  find "$${dest}" -exec chown $${installuser} {} ';' ;\
 	done
-	-rm -f $(DESTDIR)${leimdir}/leim-list.el
-	${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el
-	-rm -f $(DESTDIR)${lispdir}/subdirs.el
-	umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir}
-	subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \
+	-rm -f "$(DESTDIR)${leimdir}/leim-list.el"
+	${INSTALL_DATA} leim/leim-list.el "$(DESTDIR)${leimdir}/leim-list.el"
+	-rm -f "$(DESTDIR)${lispdir}/subdirs.el"
+	umask 022; $(srcdir)/build-aux/update-subdirs "$(DESTDIR)${lispdir}"
+	subdir="$(DESTDIR)${datadir}/emacs/${version}/site-lisp" ; \
 	  ${write_subdir}
-	subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \
+	subdir="$(DESTDIR)${datadir}/emacs/site-lisp" ; \
 	  ${write_subdir} || true
 	[ -z "${GZIP_PROG}" ] || \
 	  ( echo "Compressing *.el ..." ; \
 	    unset CDPATH; \
 	    thisdir=`/bin/pwd`; \
-	    for dir in $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}; do \
+	    for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}"; do \
 	      cd "$${thisdir}" ; \
-	      cd $${dir} || exit 1 ; \
+	      cd "$${dir}" || exit 1 ; \
 	      for f in `find . -name "*.elc" -print`; do \
-	        ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
+	        ${GZIP_PROG} -9n "`echo \"$$f\" | sed 's/.elc$$/.el/'`" ; \
 	      done ; \
 	    done )
-	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
+	-chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS}
 
 ## The above chmods are needed because "umask 022; tar ..." is not
 ## guaranteed to do the right thing; eg if we are root and tar is
@@ -633,40 +634,40 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
 ## installed etc/ directory, so we need it to run before this does.
 install-etcdoc: src install-arch-indep
 	-unset CDPATH; \
-	umask 022; ${MKDIR_P} $(DESTDIR)${etcdocdir} ; \
-	if [ "`cd ./etc; /bin/pwd`" != "`cd $(DESTDIR)${etcdocdir}; /bin/pwd`" ]; \
+	umask 022; ${MKDIR_P} "$(DESTDIR)${etcdocdir}" ; \
+	if [ "`cd ./etc; /bin/pwd`" != "`cd \"$(DESTDIR)${etcdocdir}\"; /bin/pwd`" ]; \
 	then \
 	   docfile="DOC"; \
 	   echo "Copying etc/$${docfile} to $(DESTDIR)${etcdocdir} ..." ; \
-	   ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${etcdocdir}/$${docfile}; \
+	   ${INSTALL_DATA} etc/$${docfile} "$(DESTDIR)${etcdocdir}/$${docfile}"; \
 	   $(set_installuser); \
-	     chown $${installuser} $(DESTDIR)${etcdocdir}/$${docfile} || true ; \
+	     chown $${installuser} "$(DESTDIR)${etcdocdir}/$${docfile}" || true ; \
 	else true; fi
 
 install-info: info
-	umask 022; ${MKDIR_P} $(DESTDIR)${infodir}
+	umask 022; ${MKDIR_P} "$(DESTDIR)${infodir}"
 	-unset CDPATH; \
 	thisdir=`/bin/pwd`; \
-	if [ "`cd ${srcdir}/info && /bin/pwd`" = "`cd $(DESTDIR)${infodir} && /bin/pwd`" ]; then \
+	if [ "`cd ${srcdir}/info && /bin/pwd`" = "`cd \"$(DESTDIR)${infodir}\" && /bin/pwd`" ]; then \
 	  true; \
 	else \
 	  (cd "$(DESTDIR)${infodir}"; \
 	   [ -f dir ] || \
 	     (cd "$${thisdir}"; \
-	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ); \
+	      ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir") ); \
 	   info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
 	   cd ${srcdir}/info ; \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
 	       (cd "$${thisdir}"; \
-	        ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \
+	        ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
 	        [ -n "${GZIP_PROG}" ] || continue ; \
-	        rm -f $(DESTDIR)${infodir}/$$f.gz; \
-	        ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
+	        rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
+	        ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
 	      done; \
 	     (cd "$${thisdir}"; \
-	      ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+	      ${INSTALL_INFO} --info-dir="$(DESTDIR)${infodir}" "$(DESTDIR)${infodir}/$$elt"); \
 	   done; \
 	fi
 
@@ -677,16 +678,16 @@ install-info: info
 ## ctags.1 is compressed or not.  "gzip -f" is another option here,
 ## but not sure if portable.
 install-man:
-	umask 022; ${MKDIR_P} $(DESTDIR)${man1dir}
+	umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
 	thisdir=`/bin/pwd`; \
 	cd ${mansrcdir}; \
 	for page in *.1; do \
 	  dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
 	  (cd "$${thisdir}"; \
-	   ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \
+	   ${INSTALL_DATA} ${mansrcdir}/$${page} "$(DESTDIR)${man1dir}/$${dest}"); \
 	  [ -n "${GZIP_PROG}" ] || continue ; \
-	  rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
-	  ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
+	  rm -f "$(DESTDIR)${man1dir}/$${dest}.gz"; \
+	  ${GZIP_PROG} -9n "$(DESTDIR)${man1dir}/$${dest}" || true; \
 	done
 
 ## Install those items from etc/ that need to end up elsewhere.
@@ -696,25 +697,25 @@ install-man:
 EMACS_ICON=emacs
 
 install-etc:
-	umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
+	umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}"
 	tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
 	emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \
 	sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \
 	  -e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \
 	  ${srcdir}/etc/emacs.desktop > $${tmp}; \
-	${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop; \
+	${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \
 	rm -f $${tmp}
 	thisdir=`/bin/pwd`; \
 	cd ${iconsrcdir} || exit 1; umask 022 ; \
 	for dir in */*/apps */*/mimetypes; do \
 	  [ -d $${dir} ] || continue ; \
-	  ( cd "$${thisdir}"; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
+	  ( cd "$${thisdir}"; ${MKDIR_P} "$(DESTDIR)${icondir}/$${dir}" ) ; \
 	  for icon in $${dir}/${EMACS_ICON}[.-]*; do \
 	    [ -r $${icon} ] || continue ; \
 	    ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
 	    dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \
 	    ( cd "$${thisdir}"; \
-	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
+	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} "$(DESTDIR)${icondir}/$${dir}/$${dest}" ) \
 	    || exit 1; \
 	  done ; \
 	done
@@ -734,26 +735,26 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
 	    bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
 
 	-unset CDPATH; \
-	for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do 	\
-	  if [ -d $${dir} ]; then			\
-	    case "`cd $${dir} ; /bin/pwd`" in		\
+	for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do 	\
+	  if [ -d "$${dir}" ]; then			\
+	    case `cd "$${dir}" ; /bin/pwd` in		\
 	      "`cd ${srcdir} ; /bin/pwd`"* ) ;;		\
-	      * ) rm -rf $${dir} ;;			\
+	      * ) rm -rf "$${dir}" ;;			\
 	    esac ;					\
-	    case $${dir} in				\
-	      $(DESTDIR)${datadir}/emacs/${version}/* )		\
-	        rm -rf $(DESTDIR)${datadir}/emacs/${version}	\
+	    case "$${dir}" in				\
+	      "$(DESTDIR)${datadir}/emacs/${version}"/* )		\
+	        rm -rf "$(DESTDIR)${datadir}/emacs/${version}"	\
 	      ;;					\
 	    esac ;					\
 	  fi ;						\
 	done
-	-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
+	-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
 	thisdir=`/bin/pwd`; \
 	(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
-	 if cd $(DESTDIR)${infodir}; then \
+	 if cd "$(DESTDIR)${infodir}"; then \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	     (cd "$${thisdir}"; \
-	      $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
+	      $(INSTALL_INFO) --remove --info-dir="$(DESTDIR)${infodir}" "$(DESTDIR)${infodir}/$$elt"); \
 	     if [ -n "${GZIP_PROG}" ]; then \
 	        ext=.gz; else ext=; fi; \
 	     rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
@@ -763,18 +764,18 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
 	    ext=.gz; else ext=; fi; \
 	 if cd ${mansrcdir}; then \
 	   for page in *.1; do \
-	     rm -f $(DESTDIR)${man1dir}/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
+	     rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
 	 fi)
-	(cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true)
-	(if cd $(DESTDIR)${icondir}; then \
+	(cd "$(DESTDIR)${bindir}" && rm -f $(EMACSFULL) $(EMACS) || true)
+	(if cd "$(DESTDIR)${icondir}"; then \
 	   rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
 	     hicolor/scalable/apps/${EMACS_NAME}.svg \
 	     hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
 	fi)
-	-rm -f $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop
+	-rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"
 	for file in snake-scores tetris-scores; do \
-	  file=$(DESTDIR)${gamedir}/$${file}; \
-	  [ -s $${file} ] || rm -f $$file; \
+	  file="$(DESTDIR)${gamedir}/$${file}"; \
+	  [ -s "$${file}" ] || rm -f "$$file"; \
 	done
 
 ### Windows-specific uninstall target for removing programs produced