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 /lib-src/Makefile.in | |
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 'lib-src/Makefile.in')
-rw-r--r-- | lib-src/Makefile.in | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 01c03e162cc..3aff16fed76 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -214,10 +214,10 @@ blessmail: need-blessmail: blessmail @if [ `wc -l <blessmail` != 2 ] ; then \ dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ - echo Assuming $$dir is really the mail spool directory, you should; \ - echo run lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}; \ - echo as root, to give movemail${EXEEXT} appropriate permissions.; \ - echo Do that after running make install.; \ + echo "Assuming $$dir is really the mail spool directory, you should"; \ + echo "run lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}"; \ + echo "as root, to give movemail${EXEEXT} appropriate permissions."; \ + echo "Do that after running make install."; \ fi ## This is the target invoked by the top-level Makefile. @@ -231,23 +231,23 @@ maybe-blessmail: $(BLESSMAIL_TARGET) $(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 - umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \ - touch $(DESTDIR)${gamedir}/snake-scores; \ - touch $(DESTDIR)${gamedir}/tetris-scores - -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score${EXEEXT} && chmod u+s $(DESTDIR)${archlibdir}/update-game-score${EXEEXT}; then \ - chown ${gameuser} $(DESTDIR)${gamedir}; \ - chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ + umask 022; ${MKDIR_P} "$(DESTDIR)${gamedir}"; \ + touch "$(DESTDIR)${gamedir}/snake-scores"; \ + touch "$(DESTDIR)${gamedir}/tetris-scores" + -if chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \ + chown ${gameuser} "$(DESTDIR)${gamedir}"; \ + chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \ fi - if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" \ + if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" \ != "`cd ${srcdir} && /bin/pwd`" ]; then \ for file in ${SCRIPTS}; do \ - $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \ + $(INSTALL_SCRIPT) ${srcdir}/$$file "$(DESTDIR)${archlibdir}/$$file"; \ done ; \ fi @@ -257,23 +257,23 @@ $(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 for file in ${INSTALLABLE_SCRIPTS} ; do \ - $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ + $(INSTALL_SCRIPT) ${srcdir}/$${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \ 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 for file in ${INSTALLABLE_SCRIPTS}; do \ - rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ + rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \ done - if [ -d $(DESTDIR)${archlibdir} ]; then \ - (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES} ${SCRIPTS}) \ + if [ -d "$(DESTDIR)${archlibdir}" ]; then \ + (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \ fi mostlyclean: |