Commit a318e28f authored by Glenn Morris's avatar Glenn Morris
Browse files

More Makefile quoting

* Makefile.in (install-arch-dep, install-nt, uninstall, uninstall-nt):
Quote entities that might contain whitespace.
parent 48f73cfb
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
Progress towards allowing installation in directories with whitespace. Progress towards allowing installation in directories with whitespace.
* Makefile.in (COPYDESTS, write_subdir, install-arch-dep) * Makefile.in (COPYDESTS, write_subdir, install-arch-dep)
(install-arch-indep, install-etcdoc, install-info, install-man) (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. * build-aux/update-subdirs: Handle whitespace in argument.
Check cd return value. Check cd return value.
......
...@@ -485,9 +485,9 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \ ...@@ -485,9 +485,9 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR) 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 && \ cd lib-src && \
$(MAKE) install $(MFLAGS) prefix=${prefix} \ $(MAKE) install $(MFLAGS) prefix="${prefix}" \
exec_prefix=${exec_prefix} bindir=${bindir} \ exec_prefix="${exec_prefix}" bindir="${bindir}" \
libexecdir=${libexecdir} archlibdir=${archlibdir} \ libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
INSTALL_STRIP=${INSTALL_STRIP} INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \ if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \ ${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) ...@@ -507,9 +507,9 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
install-: install-:
install-nt: install-nt:
cd $(NTDIR) && \ cd $(NTDIR) && \
$(MAKE) install $(MFLAGS) prefix=${prefix} \ $(MAKE) install $(MFLAGS) prefix="${prefix}" \
exec_prefix=${exec_prefix} bindir=${bindir} \ exec_prefix="${exec_prefix}" bindir="${bindir}" \
libexecdir=${libexecdir} archlibdir=${archlibdir} \ libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
INSTALL_STRIP=${INSTALL_STRIP} INSTALL_STRIP=${INSTALL_STRIP}
## In the share directory, we are deleting: ## In the share directory, we are deleting:
...@@ -731,8 +731,9 @@ install-strip: ...@@ -731,8 +731,9 @@ install-strip:
uninstall: uninstall-$(NTDIR) uninstall-doc uninstall: uninstall-$(NTDIR) uninstall-doc
cd lib-src && \ cd lib-src && \
$(MAKE) $(MFLAGS) uninstall \ $(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \ prefix="${prefix}" exec_prefix="${exec_prefix}" \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} bindir="${bindir}" libexecdir="${libexecdir}" \
archlibdir="${archlibdir}"
-unset CDPATH; \ -unset CDPATH; \
for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \ for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \
...@@ -784,8 +785,9 @@ uninstall-: ...@@ -784,8 +785,9 @@ uninstall-:
uninstall-nt: uninstall-nt:
cd $(NTDIR) && \ cd $(NTDIR) && \
$(MAKE) $(MFLAGS) uninstall \ $(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \ prefix="${prefix}" exec_prefix="${exec_prefix}" \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} bindir="${bindir}" libexecdir="${libexecdir}" \
archlibdir="${archlibdir}"
FRC: FRC:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment