diff options
| author | Glenn Morris | 2013-10-23 00:20:57 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-10-23 00:20:57 -0700 |
| commit | 48f73cfbf3d028b29655b207491e129607b88632 (patch) | |
| tree | f42e0fea3821990415319897db31bc1917272e9a /lib-src | |
| parent | b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d (diff) | |
| download | emacs-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 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 44 |
2 files changed, 24 insertions, 24 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 46faf95c0c0..fd4209ab225 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2013-10-23 Glenn Morris <rgm@gnu.org> | 1 | 2013-10-23 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in ($(DESTDIR)${archlibdir}): | 3 | * Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install) |
| 4 | Quote entities that might contain whitespace. | 4 | (uninstall): Quote entities that might contain whitespace. |
| 5 | 5 | ||
| 6 | 2013-10-10 Glenn Morris <rgm@gnu.org> | 6 | 2013-10-10 Glenn Morris <rgm@gnu.org> |
| 7 | 7 | ||
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: | |||
| 214 | need-blessmail: blessmail | 214 | need-blessmail: blessmail |
| 215 | @if [ `wc -l <blessmail` != 2 ] ; then \ | 215 | @if [ `wc -l <blessmail` != 2 ] ; then \ |
| 216 | dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ | 216 | dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \ |
| 217 | echo Assuming $$dir is really the mail spool directory, you should; \ | 217 | echo "Assuming $$dir is really the mail spool directory, you should"; \ |
| 218 | echo run lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}; \ | 218 | echo "run lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}"; \ |
| 219 | echo as root, to give movemail${EXEEXT} appropriate permissions.; \ | 219 | echo "as root, to give movemail${EXEEXT} appropriate permissions."; \ |
| 220 | echo Do that after running make install.; \ | 220 | echo "Do that after running make install."; \ |
| 221 | fi | 221 | fi |
| 222 | 222 | ||
| 223 | ## This is the target invoked by the top-level Makefile. | 223 | ## This is the target invoked by the top-level Makefile. |
| @@ -231,23 +231,23 @@ maybe-blessmail: $(BLESSMAIL_TARGET) | |||
| 231 | $(DESTDIR)${archlibdir}: all | 231 | $(DESTDIR)${archlibdir}: all |
| 232 | @echo | 232 | @echo |
| 233 | @echo "Installing utilities run internally by Emacs." | 233 | @echo "Installing utilities run internally by Emacs." |
| 234 | umask 022; ${MKDIR_P} $(DESTDIR)${archlibdir} | 234 | umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}" |
| 235 | if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" != "`/bin/pwd`" ]; then \ | 235 | if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" != "`/bin/pwd`" ]; then \ |
| 236 | for file in ${UTILITIES}; do \ | 236 | for file in ${UTILITIES}; do \ |
| 237 | $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ | 237 | $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file "$(DESTDIR)${archlibdir}/$$file" ; \ |
| 238 | done ; \ | 238 | done ; \ |
| 239 | fi | 239 | fi |
| 240 | umask 022; ${MKDIR_P} $(DESTDIR)${gamedir}; \ | 240 | umask 022; ${MKDIR_P} "$(DESTDIR)${gamedir}"; \ |
| 241 | touch $(DESTDIR)${gamedir}/snake-scores; \ | 241 | touch "$(DESTDIR)${gamedir}/snake-scores"; \ |
| 242 | touch $(DESTDIR)${gamedir}/tetris-scores | 242 | touch "$(DESTDIR)${gamedir}/tetris-scores" |
| 243 | -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score${EXEEXT} && chmod u+s $(DESTDIR)${archlibdir}/update-game-score${EXEEXT}; then \ | 243 | -if chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \ |
| 244 | chown ${gameuser} $(DESTDIR)${gamedir}; \ | 244 | chown ${gameuser} "$(DESTDIR)${gamedir}"; \ |
| 245 | chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ | 245 | chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \ |
| 246 | fi | 246 | fi |
| 247 | if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" \ | 247 | if [ "`cd \"$(DESTDIR)${archlibdir}\" && /bin/pwd`" \ |
| 248 | != "`cd ${srcdir} && /bin/pwd`" ]; then \ | 248 | != "`cd ${srcdir} && /bin/pwd`" ]; then \ |
| 249 | for file in ${SCRIPTS}; do \ | 249 | for file in ${SCRIPTS}; do \ |
| 250 | $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \ | 250 | $(INSTALL_SCRIPT) ${srcdir}/$$file "$(DESTDIR)${archlibdir}/$$file"; \ |
| 251 | done ; \ | 251 | done ; \ |
| 252 | fi | 252 | fi |
| 253 | 253 | ||
| @@ -257,23 +257,23 @@ $(DESTDIR)${archlibdir}: all | |||
| 257 | install: $(DESTDIR)${archlibdir} | 257 | install: $(DESTDIR)${archlibdir} |
| 258 | @echo | 258 | @echo |
| 259 | @echo "Installing utilities for users to run." | 259 | @echo "Installing utilities for users to run." |
| 260 | umask 022; ${MKDIR_P} $(DESTDIR)${bindir} | 260 | umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" |
| 261 | for file in ${INSTALLABLES} ; do \ | 261 | for file in ${INSTALLABLES} ; do \ |
| 262 | $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ | 262 | $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ |
| 263 | done | 263 | done |
| 264 | for file in ${INSTALLABLE_SCRIPTS} ; do \ | 264 | for file in ${INSTALLABLE_SCRIPTS} ; do \ |
| 265 | $(INSTALL_SCRIPT) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ | 265 | $(INSTALL_SCRIPT) ${srcdir}/$${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \ |
| 266 | done | 266 | done |
| 267 | 267 | ||
| 268 | uninstall: | 268 | uninstall: |
| 269 | for file in ${INSTALLABLES}; do \ | 269 | for file in ${INSTALLABLES}; do \ |
| 270 | rm -f $(DESTDIR)${bindir}/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ | 270 | rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ |
| 271 | done | 271 | done |
| 272 | for file in ${INSTALLABLE_SCRIPTS}; do \ | 272 | for file in ${INSTALLABLE_SCRIPTS}; do \ |
| 273 | rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ | 273 | rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \ |
| 274 | done | 274 | done |
| 275 | if [ -d $(DESTDIR)${archlibdir} ]; then \ | 275 | if [ -d "$(DESTDIR)${archlibdir}" ]; then \ |
| 276 | (cd $(DESTDIR)${archlibdir} && rm -f ${UTILITIES} ${SCRIPTS}) \ | 276 | (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \ |
| 277 | fi | 277 | fi |
| 278 | 278 | ||
| 279 | mostlyclean: | 279 | mostlyclean: |