diff options
| author | Glenn Morris | 2013-10-22 23:22:54 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-10-22 23:22:54 -0700 |
| commit | b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d (patch) | |
| tree | 0efdb7b6fafc13b3c0a4dca69bbd3a2a3ac9e2c4 /nextstep | |
| parent | e4ea223d7332952cc0e1275fa4c982645e11b17f (diff) | |
| download | emacs-b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d.tar.gz emacs-b8e3b0a9ecb6c8ca1c2a4db189e92bcf08b5052d.zip | |
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 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog | 5 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index 42086ec1007..7d3cceba205 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-10-23 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (${ns_check_file} ${ns_appdir}): | ||
| 4 | Quote entities that might contain whitespace. | ||
| 5 | |||
| 1 | 2013-09-02 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2013-09-02 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * Makefile.in (${ns_check_file}): Add so Emacs.app gets properly | 8 | * Makefile.in (${ns_check_file}): Add so Emacs.app gets properly |
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 3d80ddb7ad2..b5377232e31 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in | |||
| @@ -38,7 +38,7 @@ ${ns_check_file} ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc} | |||
| 38 | ${MKDIR_P} ${ns_appdir} | 38 | ${MKDIR_P} ${ns_appdir} |
| 39 | ( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \ | 39 | ( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \ |
| 40 | ( cd ${ns_appdir} ; umask 022; tar xf - ) | 40 | ( cd ${ns_appdir} ; umask 022; tar xf - ) |
| 41 | [ `cd ${srcdir} && /bin/pwd` = `/bin/pwd` ] || \ | 41 | [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] || \ |
| 42 | ( cd ${ns_appsrc} ; tar cfh - . ) | \ | 42 | ( cd ${ns_appsrc} ; tar cfh - . ) | \ |
| 43 | ( cd ${ns_appdir} ; umask 022; tar xf - ) | 43 | ( cd ${ns_appdir} ; umask 022; tar xf - ) |
| 44 | touch ${ns_appdir} | 44 | touch ${ns_appdir} |