aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorGlenn Morris2013-10-23 00:20:57 -0700
committerGlenn Morris2013-10-23 00:20:57 -0700
commit48f73cfbf3d028b29655b207491e129607b88632 (patch)
treef42e0fea3821990415319897db31bc1917272e9a /nt
parentb8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d (diff)
downloademacs-48f73cfbf3d028b29655b207491e129607b88632.tar.gz
emacs-48f73cfbf3d028b29655b207491e129607b88632.zip
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/ChangeLog2
-rw-r--r--nt/Makefile.in16
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 @@
12013-10-23 Glenn Morris <rgm@gnu.org> 12013-10-23 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in ($(DESTDIR)${archlibdir}): 3 * Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall):
4 Quote entities that might contain whitespace. 4 Quote entities that might contain whitespace.
5 5
62013-10-14 Eli Zaretskii <eliz@gnu.org> 62013-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}
141$(DESTDIR)${archlibdir}: all 141$(DESTDIR)${archlibdir}: all
142 @echo 142 @echo
143 @echo "Installing utilities run internally by Emacs." 143 @echo "Installing utilities run internally by Emacs."
144 umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir} 144 umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
145 if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" != "`/bin/pwd`" ]; then \ 145 if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" != "`/bin/pwd`" ]; then \
146 for file in ${UTILITIES}; do \ 146 for file in ${UTILITIES}; do \
147 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ 147 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file "$(DESTDIR)${archlibdir}/$$file" ; \
148 done ; \ 148 done ; \
149 fi 149 fi
150 150
@@ -154,17 +154,17 @@ $(DESTDIR)${archlibdir}: all
154install: $(DESTDIR)${archlibdir} 154install: $(DESTDIR)${archlibdir}
155 @echo 155 @echo
156 @echo "Installing utilities for users to run." 156 @echo "Installing utilities for users to run."
157 umask 022; ${MKDIR_P} $(DESTDIR)${bindir} 157 umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
158 for file in ${INSTALLABLES} ; do \ 158 for file in ${INSTALLABLES} ; do \
159 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ 159 $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
160 done 160 done
161 161
162uninstall: 162uninstall:
163 for file in ${INSTALLABLES}; do \ 163 for file in ${INSTALLABLES}; do \
164 rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ 164 rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \
165 done 165 done
166 if [ -d $(DESTDIR)${archlibdir} ]; then \ 166 if [ -d "$(DESTDIR)${archlibdir}" ]; then \
167 (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES}) \ 167 (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES}) \
168 fi 168 fi
169 169
170mostlyclean: 170mostlyclean: