X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f67dce44d5067f58d29880c39b05ab50ab706958..71e3276bc574257845c81c095d41ed58399089fe:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a0d91171d3..1a92ca8aaf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@
 # make docs
 #      Make Emacs documentation files from their sources; requires makeinfo.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # This may not work with certain non-GNU make's.  It only matters when
 # inheriting a CDPATH not starting with the current directory.
@@ -163,6 +163,9 @@ bitmapdir=@bitmapdir@
 
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
+abs_srcdir=@abs_srcdir@
+# MinGW CPPFLAGS may use this.
+abs_top_srcdir=@abs_top_srcdir@
 
 # Where the manpage source files are kept.
 mansrcdir=$(srcdir)/doc/man
@@ -216,7 +219,7 @@ lisppath=@lisppath@
 # before they've been installed in their final location.
 # This should be a colon-separated list of directories.
 # Normally it points to the lisp/ directory in the sources.
-buildlisppath=${srcdir}/lisp
+buildlisppath=${abs_srcdir}/lisp
 
 # Where to install the other architecture-independent
 # data files distributed with Emacs (like the tutorial,
@@ -259,8 +262,6 @@ LN_S_FILEONLY = @LN_S_FILEONLY@
 
 # We use gzip to compress installed .el files.
 GZIP_PROG = @GZIP_PROG@
-# If non-nil, gzip the installed Info and man pages.
-GZIP_INFO = @GZIP_INFO@
 
 # ============================= Targets ==============================
 
@@ -285,7 +286,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}
 
@@ -342,7 +343,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
 # Use the value of ${locallisppath} supplied by `configure',
 # to support the --enable-locallisppath argument.
 epaths-force-w32: FRC
-	@(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; 	\
+	@(w32srcdir=`echo "${abs_srcdir}" | ${msys_to_w32}` ; 	\
 	  prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \
 	  locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \
 	  sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$		\
@@ -352,9 +353,13 @@ epaths-force-w32: FRC
 	  -e "/^.*#/s|@SRC@|$${w32srcdir}|g") &&		\
 	${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
 
+# If lib/Makefile would build files in '.', then build them before
+# building 'lib', to avoid races with parallel makes.
+lib: am--refresh
+
 lib-src src: $(NTDIR) lib
 
-src:	lib-src FRC
+src: lib-src
 
 # We need to build `emacs' in `src' to compile the *.elc files in `lisp'
 # and `leim'.
@@ -376,18 +381,15 @@ lib lib-src lisp leim nt: Makefile FRC
 # all preloaded elisp files, and only then dump the actual src/emacs, which
 # is not wrong, but is overkill in 99.99% of the cases.
 src: Makefile FRC
-	boot=bootstrap-emacs$(EXEEXT);                         \
-	if [ ! -x "src/$$boot" ]; then                                     \
-	    cd $@; $(MAKE) all $(MFLAGS)                                   \
-	      CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'         \
-	      LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \
-	fi;
-	if [ -r .bzr/checkout/dirstate ]; then 			\
-	    vcswitness="`pwd`/.bzr/checkout/dirstate"; 	\
-	fi; 							\
-	cd $@; $(MAKE) all $(MFLAGS)                           \
-	  CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
-	  LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS=""	\
+	dirstate='.bzr/checkout/dirstate';				\
+	vcswitness='$$(srcdir)/../'$$dirstate;				\
+	[ -r "$(srcdir)/$$dirstate" ] || vcswitness='';			\
+	cd $@ || exit;							\
+	boot=bootstrap-emacs$(EXEEXT);					\
+	[ ! -x "$$boot" ] || boot='';					\
+	$(MAKE) all $(MFLAGS)						\
+	  CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'		\
+	  LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"	\
 	  VCSWITNESS="$$vcswitness"
 
 blessmail: Makefile src FRC
@@ -469,32 +471,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} \
+	  $(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; \
@@ -507,9 +509,9 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
 install-:
 install-nt:
 	cd $(NTDIR) && \
-	  $(MAKE) install $(MFLAGS) prefix=${prefix} \
-	    exec_prefix=${exec_prefix} bindir=${bindir} \
-	    libexecdir=${libexecdir} archlibdir=${archlibdir} \
+	  $(MAKE) install $(MFLAGS) prefix="${prefix}" \
+	    exec_prefix="${exec_prefix}" bindir="${bindir}" \
+	    libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
 	    INSTALL_STRIP=${INSTALL_STRIP}
 
 ## In the share directory, we are deleting:
@@ -568,62 +570,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` ] && \
+	    [ "`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 \
-	      cd $${thisdir} ; \
-	      cd $${dir} || exit 1 ; \
+	    for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}"; do \
+	      cd "$${thisdir}" ; \
+	      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,41 +636,42 @@ 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`; \
-	[ `cd ${srcdir}/info && /bin/pwd` = `cd $(DESTDIR)${infodir} && /bin/pwd` ] || \
-	  (cd $(DESTDIR)${infodir};  \
+	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) ; \
-	   info_misc=`cd $${thisdir}/doc/misc && \
-		$(QUIET_SUBMAKE) $(MAKE) -s echo-info \
-	   `; \
+	     (cd "$${thisdir}"; \
+	      ${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); \
-	        ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
-	        rm -f $(DESTDIR)${infodir}/$$f.gz; \
-	        ${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \
+	       (cd "$${thisdir}"; \
+	        ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
+	        [ -n "${GZIP_PROG}" ] || continue ; \
+	        rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
+	        ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
 	      done; \
-	     (cd $${thisdir}; \
-	      ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
-	   done)
+	     (cd "$${thisdir}"; \
+	      ${INSTALL_INFO} --info-dir="$(DESTDIR)${infodir}" "$(DESTDIR)${infodir}/$$elt"); \
+	   done; \
+	fi
 
 ## "gzip || true" is because some gzips exit with non-zero status
 ## if compression would not reduce the file size.  Eg, the gzip in
@@ -676,16 +680,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}); \
-	  ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \
-	  rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \
-	  ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \
+	  (cd "$${thisdir}"; \
+	   ${INSTALL_DATA} ${mansrcdir}/$${page} "$(DESTDIR)${man1dir}/$${dest}"); \
+	  [ -n "${GZIP_PROG}" ] || continue ; \
+	  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.
@@ -695,25 +699,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} ) \
+	    ( cd "$${thisdir}"; \
+	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} "$(DESTDIR)${icondir}/$${dir}/$${dest}" ) \
 	    || exit 1; \
 	  done ; \
 	done
@@ -729,51 +733,52 @@ install-strip:
 uninstall: uninstall-$(NTDIR) uninstall-doc
 	cd lib-src && 					\
 	 $(MAKE) $(MFLAGS) uninstall			\
-	    prefix=${prefix} exec_prefix=${exec_prefix}	\
-	    bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
+	    prefix="${prefix}" exec_prefix="${exec_prefix}" \
+	    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		\
-	      `cd ${srcdir} ; /bin/pwd`* ) ;;		\
-	      * ) rm -rf $${dir} ;;			\
+	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}" ;;			\
 	    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); \
-	     if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+	     (cd "$${thisdir}"; \
+	      $(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; \
 	   done; \
 	 fi)
-	(if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
+	(if [ -n "${GZIP_PROG}" ]; then \
 	    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
@@ -782,8 +787,9 @@ uninstall-:
 uninstall-nt:
 	cd $(NTDIR) && 					\
 	 $(MAKE) $(MFLAGS) uninstall			\
-	    prefix=${prefix} exec_prefix=${exec_prefix}	\
-	    bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
+	    prefix="${prefix}" exec_prefix="${exec_prefix}" \
+	    bindir="${bindir}" libexecdir="${libexecdir}" \
+	    archlibdir="${archlibdir}"
 
 FRC:
 
@@ -797,17 +803,17 @@ FRC:
 ###      target for GCC does not delete `libgcc.a', because recompiling it
 ###      is rarely necessary and takes a lot of time.
 mostlyclean: FRC
-	(cd src;      $(MAKE) $(MFLAGS) mostlyclean)
-	(cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean)
-	(cd lwlib;    $(MAKE) $(MFLAGS) mostlyclean)
-	(cd lib;      $(MAKE) $(MFLAGS) mostlyclean)
-	(cd lib-src;  $(MAKE) $(MFLAGS) mostlyclean)
-	(cd nt;       $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd doc/misc &&   $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) mostlyclean)
-	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) mostlyclean)
-	(cd leim;     $(MAKE) $(MFLAGS) mostlyclean)
+	cd src      && $(MAKE) $(MFLAGS) mostlyclean
+	cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean
+	cd lwlib    && $(MAKE) $(MFLAGS) mostlyclean
+	cd lib      && $(MAKE) $(MFLAGS) mostlyclean
+	cd lib-src  && $(MAKE) $(MFLAGS) mostlyclean
+	cd nt       && $(MAKE) $(MFLAGS) mostlyclean
+	-cd doc/emacs     && $(MAKE) $(MFLAGS) mostlyclean
+	-cd doc/misc      && $(MAKE) $(MFLAGS) mostlyclean
+	-cd doc/lispref   && $(MAKE) $(MFLAGS) mostlyclean
+	-cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean
+	cd leim     && $(MAKE) $(MFLAGS) mostlyclean
 
 ### `clean'
 ###      Delete all files from the current directory that are normally
@@ -819,18 +825,18 @@ mostlyclean: FRC
 ###      Delete `.dvi' files here if they are not part of the distribution.
 clean: FRC
 	-rm -f etc/emacs.tmpdesktop
-	(cd src;      $(MAKE) $(MFLAGS) clean)
-	(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
-	(cd lwlib;    $(MAKE) $(MFLAGS) clean)
-	(cd lib;      $(MAKE) $(MFLAGS) clean)
-	(cd lib-src;  $(MAKE) $(MFLAGS) clean)
-	(cd nt;       $(MAKE) $(MFLAGS) clean)
-	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) clean)
-	-(cd doc/misc &&   $(MAKE) $(MFLAGS) clean)
-	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) clean)
-	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) clean)
-	(cd leim;     $(MAKE) $(MFLAGS) clean)
-	(cd nextstep && $(MAKE) $(MFLAGS) clean)
+	cd src      && $(MAKE) $(MFLAGS) clean
+	cd oldXMenu && $(MAKE) $(MFLAGS) clean
+	cd lwlib    && $(MAKE) $(MFLAGS) clean
+	cd lib      && $(MAKE) $(MFLAGS) clean
+	cd lib-src  && $(MAKE) $(MFLAGS) clean
+	cd nt       && $(MAKE) $(MFLAGS) clean
+	-cd doc/emacs     && $(MAKE) $(MFLAGS) clean
+	-cd doc/misc      && $(MAKE) $(MFLAGS) clean
+	-cd doc/lispref   && $(MAKE) $(MFLAGS) clean
+	-cd doc/lispintro && $(MAKE) $(MFLAGS) clean
+	cd leim     && $(MAKE) $(MFLAGS) clean
+	cd nextstep && $(MAKE) $(MFLAGS) clean
 
 ### `bootclean'
 ###      Delete all files that need to be remade for a clean bootstrap.
@@ -846,42 +852,44 @@ top_distclean=\
 	${top_bootclean}; \
 	rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
 distclean: FRC
-	(cd src;      $(MAKE) $(MFLAGS) distclean)
-	(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
-	(cd lwlib;    $(MAKE) $(MFLAGS) distclean)
-	(cd lib;      $(MAKE) $(MFLAGS) distclean)
-	(cd lib-src;  $(MAKE) $(MFLAGS) distclean)
-	(cd nt;       $(MAKE) $(MFLAGS) distclean)
-	(cd doc/emacs &&    $(MAKE) $(MFLAGS) distclean)
-	(cd doc/misc &&    $(MAKE) $(MFLAGS) distclean)
-	(cd doc/lispref &&    $(MAKE) $(MFLAGS) distclean)
-	(cd doc/lispintro &&    $(MAKE) $(MFLAGS) distclean)
-	(cd leim;     $(MAKE) $(MFLAGS) distclean)
-	(cd lisp;     $(MAKE) $(MFLAGS) distclean)
-	(cd nextstep && $(MAKE) $(MFLAGS) distclean)
-	[ ! -d test/automated ] || \
-	  cd test/automated && $(MAKE) $(MFLAGS) distclean
+	cd src      && $(MAKE) $(MFLAGS) distclean
+	cd oldXMenu && $(MAKE) $(MFLAGS) distclean
+	cd lwlib    && $(MAKE) $(MFLAGS) distclean
+	cd lib      && $(MAKE) $(MFLAGS) distclean
+	cd lib-src  && $(MAKE) $(MFLAGS) distclean
+	cd nt       && $(MAKE) $(MFLAGS) distclean
+	cd doc/emacs     && $(MAKE) $(MFLAGS) distclean
+	cd doc/misc      && $(MAKE) $(MFLAGS) distclean
+	cd doc/lispref   && $(MAKE) $(MFLAGS) distclean
+	cd doc/lispintro && $(MAKE) $(MFLAGS) distclean
+	cd leim     && $(MAKE) $(MFLAGS) distclean
+	cd lisp     && $(MAKE) $(MFLAGS) distclean
+	cd nextstep && $(MAKE) $(MFLAGS) distclean
+	[ ! -d test/automated ] || { \
+	  cd test/automated && $(MAKE) $(MFLAGS) distclean; \
+	}
 	${top_distclean}
 
 ### `bootstrap-clean'
 ###      Delete everything that can be reconstructed by `make' and that
 ###      needs to be deleted in order to force a bootstrap from a clean state.
 bootstrap-clean: FRC
-	(cd src;      $(MAKE) $(MFLAGS) bootstrap-clean)
-	(cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd lwlib;    $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd lib;      $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd lib-src;  $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd nt;       $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd doc/emacs &&   $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd doc/misc &&   $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd doc/lispref &&   $(MAKE) $(MFLAGS) maintainer-clean)
-	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
-	(cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean)
-	[ ! -d test/automated ] || \
-	  cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean
+	cd src      && $(MAKE) $(MFLAGS) bootstrap-clean
+	cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean
+	cd lwlib    && $(MAKE) $(MFLAGS) maintainer-clean
+	cd lib      && $(MAKE) $(MFLAGS) maintainer-clean
+	cd lib-src  && $(MAKE) $(MFLAGS) maintainer-clean
+	cd nt       && $(MAKE) $(MFLAGS) maintainer-clean
+	-cd doc/emacs     && $(MAKE) $(MFLAGS) maintainer-clean
+	-cd doc/misc      && $(MAKE) $(MFLAGS) maintainer-clean
+	-cd doc/lispref   && $(MAKE) $(MFLAGS) maintainer-clean
+	-cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean
+	cd leim     && $(MAKE) $(MFLAGS) maintainer-clean
+	cd lisp     && $(MAKE) $(MFLAGS) bootstrap-clean
+	cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
+	[ ! -d test/automated ] || { \
+	  cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean; \
+	}
 	[ ! -f config.log ] || mv -f config.log config.log~
 	${top_bootclean}
 
@@ -900,10 +908,11 @@ top_maintainer_clean=\
 	${top_distclean}; \
 	rm -fr autom4te.cache
 maintainer-clean: bootstrap-clean FRC
-	(cd src;      $(MAKE) $(MFLAGS) maintainer-clean)
-	(cd lisp;     $(MAKE) $(MFLAGS) maintainer-clean)
-	[ ! -d test/automated ] || \
-	  cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean
+	cd src  && $(MAKE) $(MFLAGS) maintainer-clean
+	cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
+	[ ! -d test/automated ] || { \
+	  cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean; \
+	}
 	${top_maintainer_clean}
 
 ### This doesn't actually appear in the coding standards, but Karl
@@ -1023,13 +1032,15 @@ info: force-info
 	fi
 
 # The info/dir file must be updated by hand when new manuals are added.
+# Cannot add an info/dir entry for efaq-w32 since it is not installed
+# on all platforms.
 check-info-dir: info
 	cd info ; \
 	missing= ; \
 	for file in *; do \
 	  test -f "$${file}" || continue ; \
 	  case $${file} in \
-	    *-[0-9]*|COPYING|dir) continue ;; \
+	    *-[0-9]*|COPYING|dir|efaq-w32*) continue ;; \
 	  esac ; \
 	  file=`echo $${file} | sed 's/\.info//'` ; \
 	  grep -q -F ": ($${file})." dir || missing="$${missing} $${file}" ; \
@@ -1064,5 +1075,5 @@ check-declare:
 	  echo "You must build Emacs to use this command"; \
 	  exit 1; \
 	fi
-	(cd leim; $(MAKE) $(MFLAGS) $@)
-	(cd lisp; $(MAKE) $(MFLAGS) $@)
+	cd leim && $(MAKE) $(MFLAGS) $@
+	cd lisp && $(MAKE) $(MFLAGS) $@