[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114751: More Makefile quoting
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114751: More Makefile quoting |
Date: |
Wed, 23 Oct 2013 07:30:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114751
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-23 00:28:30 -0700
message:
More Makefile quoting
* Makefile.in (install-arch-dep, install-nt, uninstall, uninstall-nt):
Quote entities that might contain whitespace.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-23 07:20:57 +0000
+++ b/ChangeLog 2013-10-23 07:28:30 +0000
@@ -3,7 +3,8 @@
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.
+ (install-etc, uninstall, install-nt, uninstall-nt):
+ Quote entities that might contain whitespace.
* build-aux/update-subdirs: Handle whitespace in argument.
Check cd return value.
=== modified file 'Makefile.in'
--- a/Makefile.in 2013-10-23 07:20:57 +0000
+++ b/Makefile.in 2013-10-23 07:28:30 +0000
@@ -485,9 +485,9 @@
install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
cd lib-src && \
- $(MAKE) install $(MFLAGS) prefix=${prefix} \
- exec_prefix=${exec_prefix} bindir=${bindir} \
- libexecdir=${libexecdir} archlibdir=${archlibdir} \
+ $(MAKE) install $(MFLAGS) prefix="${prefix}" \
+ exec_prefix="${exec_prefix}" bindir="${bindir}" \
+ libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT}
"$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
@@ -507,9 +507,9 @@
install-:
install-nt:
cd $(NTDIR) && \
- $(MAKE) install $(MFLAGS) prefix=${prefix} \
- exec_prefix=${exec_prefix} bindir=${bindir} \
- libexecdir=${libexecdir} archlibdir=${archlibdir} \
+ $(MAKE) install $(MFLAGS) prefix="${prefix}" \
+ exec_prefix="${exec_prefix}" bindir="${bindir}" \
+ libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
INSTALL_STRIP=${INSTALL_STRIP}
## In the share directory, we are deleting:
@@ -731,8 +731,9 @@
uninstall: uninstall-$(NTDIR) uninstall-doc
cd lib-src && \
$(MAKE) $(MFLAGS) uninstall \
- prefix=${prefix} exec_prefix=${exec_prefix} \
- bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
+ prefix="${prefix}" exec_prefix="${exec_prefix}" \
+ bindir="${bindir}" libexecdir="${libexecdir}" \
+ archlibdir="${archlibdir}"
-unset CDPATH; \
for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \
@@ -784,8 +785,9 @@
uninstall-nt:
cd $(NTDIR) && \
$(MAKE) $(MFLAGS) uninstall \
- prefix=${prefix} exec_prefix=${exec_prefix} \
- bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
+ prefix="${prefix}" exec_prefix="${exec_prefix}" \
+ bindir="${bindir}" libexecdir="${libexecdir}" \
+ archlibdir="${archlibdir}"
FRC:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114751: More Makefile quoting,
Glenn Morris <=