More Makefile quoting

* Makefile.in (install-arch-dep, install-nt, uninstall, uninstall-nt):
Quote entities that might contain whitespace.

diff --git a/ChangeLog b/ChangeLog
index 00658d0df8831f4dc1b2c6ac89978b6bd190fc32..d7bb5212601e6559aca6382a26ae2f099dc9d6fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@
        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.
+       (install-etc, uninstall, install-nt, uninstall-nt):
+       Quote entities that might contain whitespace.
        * build-aux/update-subdirs: Handle whitespace in argument.
        Check cd return value.
 

diff --git a/Makefile.in b/Makefile.in
index aa3ade158ed769ff01de06ae3781e714723c25a5..f97b03b99e01cf438f96d27fd2c535ef95d47723 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -485,9 +485,9 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
 install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
        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 ; \
@@ -507,9 +507,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:
@@ -731,8 +731,9 @@ 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    \
@@ -784,8 +785,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: