diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-10-22 23:22:54 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-10-22 23:22:54 -0700 |
| commit | b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d (patch) | |
| tree | 0efdb7b6fafc13b3c0a4dca69bbd3a2a3ac9e2c4 /lib-src | |
| parent | e4ea223d7332952cc0e1275fa4c982645e11b17f (diff) | |
| download | emacs-b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d.tar.gz | |
Make building in directories with whitespace possible
Make has trouble with targets containing whitespace,
http://savannah.gnu.org/bugs/?712, so the general approach is
to use relative paths where possible. It's generally only Emacs
itself that needs absolute paths, eg in src/epaths.h.
* configure.ac (srcdir): Don't make it absolute - abs_srcdir exists.
* Makefile.in (abs_srcdir): New, set by configure.
(buildlisppath): Use abs_srcdir.
(install-arch-indep, install-etcdoc, install-info, install-man)
(install-etc): Quote entities that might contain whitespace.
* admin/unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el):
Quote entities that might contain whitespace.
* leim/Makefile.in (abs_srcdir): New, set by configure.
(buildlisppath): Use abs_srcdir.
(RUN_EMACS, .el.elc, changed.tit, changed.misc, leim-list.el)
($(srcdir)/ja-dic/ja-dic.el, setwins, distclean, check-declare):
Quote entities that might contain whitespace.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
Quote entities that might contain whitespace.
* lisp/Makefile.in (abs_srcdir, abs_lisp): New, set by configure.
(emacs, compile, compile-always):
Quote entities that might contain whitespace.
(custom-deps, finder-data, autoloads): Use abs_lisp.
($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el)
($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el)
($(CAL_DIR)/hol-loaddefs.el): Manually expand target file name.
* nextstep/Makefile.in (${ns_check_file} ${ns_appdir}):
Quote entities that might contain whitespace.
* nt/Makefile.in ($(DESTDIR)${archlibdir}):
Quote entities that might contain whitespace.
* src/Makefile.in (RUN_TEMACS): Make relative (again).
($(leimdir)/leim-list.el, .el.elc, $(lispsource)/loaddefs.el)
(bootstrap-emacs$(EXEEXT)):
Quote entities that might contain whitespace.
* test/automated/Makefile.in (abs_top_srcdir, top_builddir):
New, set by configure.
(top_srcdir): Remove.
(abs_test, abs_lispsrc): New.
(lisp): No longer absolute.
(emacs, lisp-compile, compile, compile-always):
Quote entities that might contain whitespace.
Fixes: debbugs:15675
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0b91cc4887f..46faf95c0c0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2013-10-23 Glenn Morris <rgm@gnu.org> + + * Makefile.in ($(DESTDIR)${archlibdir}): + Quote entities that might contain whitespace. + 2013-10-10 Glenn Morris <rgm@gnu.org> * make-docfile.c (search_lisp_doc_at_eol): diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 994eb2bb266..01c03e162cc 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -232,7 +232,7 @@ $(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 \ + if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" != "`/bin/pwd`" ]; then \ for file in ${UTILITIES}; do \ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ done ; \ @@ -244,8 +244,8 @@ $(DESTDIR)${archlibdir}: all chown ${gameuser} $(DESTDIR)${gamedir}; \ chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \ fi - if [ `cd $(DESTDIR)${archlibdir} && /bin/pwd` \ - != `cd ${srcdir} && /bin/pwd` ]; then \ + if [ "`cd $(DESTDIR)${archlibdir} && /bin/pwd`" \ + != "`cd ${srcdir} && /bin/pwd`" ]; then \ for file in ${SCRIPTS}; do \ $(INSTALL_SCRIPT) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \ done ; \ |