diff options
| author | Glenn Morris <[email protected]> | 2013-10-22 23:22:54 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2013-10-22 23:22:54 -0700 |
| commit | b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d (patch) | |
| tree | 0efdb7b6fafc13b3c0a4dca69bbd3a2a3ac9e2c4 /admin | |
| parent | e4ea223d7332952cc0e1275fa4c982645e11b17f (diff) | |
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 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/unidata/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 31247765a2..9d5eda1cad 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2013-10-23 Glenn Morris <[email protected]> + + * unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el): + Quote entities that might contain whitespace. + 2013-10-07 Paul Eggert <[email protected]> Improve support for popcount and counting trailing zeros (Bug#15550). diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index df225cc8cb..91fb5a0730 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -30,7 +30,7 @@ abs_top_builddir = @abs_top_builddir@ EMACS = ${abs_top_builddir}/src/emacs DSTDIR = ${top_srcdir}/lisp/international -emacs = ${EMACS} -batch --no-site-file --no-site-lisp +emacs = "${EMACS}" -batch --no-site-file --no-site-lisp all: ${DSTDIR}/charprop.el @@ -42,7 +42,7 @@ unidata.txt: ${srcdir}/UnicodeData.txt ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \ - -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt + -f unidata-gen-files ${srcdir} "${abs_builddir}/unidata.txt" ## Like the above, but generate in PWD rather than lisp/international. charprop.el: ${srcdir}/unidata-gen.elc unidata.txt |