diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-10-23 00:20:57 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-10-23 00:20:57 -0700 |
| commit | 48f73cfbf3d028b29655b207491e129607b88632 (patch) | |
| tree | f42e0fea3821990415319897db31bc1917272e9a /nt | |
| parent | b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d (diff) | |
| download | emacs-48f73cfbf3d028b29655b207491e129607b88632.tar.gz | |
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.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 2 | ||||
| -rw-r--r-- | nt/Makefile.in | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index a04a67b7ce9..53381f1e8b5 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,6 +1,6 @@ 2013-10-23 Glenn Morris <rgm@gnu.org> - * Makefile.in ($(DESTDIR)${archlibdir}): + * Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall): Quote entities that might contain whitespace. 2013-10-14 Eli Zaretskii <eliz@gnu.org> diff --git a/nt/Makefile.in b/nt/Makefile.in index cc640152cb6..c29cc7e91ec 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -141,10 +141,10 @@ all: ${EXE_FILES} $(DESTDIR)${archlibdir}: all @echo @echo "Installing utilities run internally by Emacs." - umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir} - if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" != "`/bin/pwd`" ]; then \ + umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}" + if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" != "`/bin/pwd`" ]; then \ for file in ${UTILITIES}; do \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ + $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file "$(DESTDIR)${archlibdir}/$$file" ; \ done ; \ fi @@ -154,17 +154,17 @@ $(DESTDIR)${archlibdir}: all install: $(DESTDIR)${archlibdir} @echo @echo "Installing utilities for users to run." - umask 022; ${MKDIR_P} $(DESTDIR)${bindir} + umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" for file in ${INSTALLABLES} ; do \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ + $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ done uninstall: for file in ${INSTALLABLES}; do \ - rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ + rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ done - if [ -d $(DESTDIR)${archlibdir} ]; then \ - (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES}) \ + if [ -d "$(DESTDIR)${archlibdir}" ]; then \ + (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES}) \ fi mostlyclean: |