procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More Makefile quoting

Browse source 
* Makefile.in (install-arch-dep, install-nt, uninstall, uninstall-nt):
Quote entities that might contain whitespace.
This commit is contained in:
Glenn Morris 2013-10-23 00:28:30 -07:00
parent 48f73cfbf3
commit a318e28f0d
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -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.

22
Makefile.in
View file

@ -485,9 +485,9 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
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-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
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 @@ install-strip:
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-:
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: