diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-22 17:56:22 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-22 17:56:22 +0100 |
| commit | 88ac92b2d5beaf4aee7d7bb4f3dc9a86da823550 (patch) | |
| tree | 16c1527969be06b21275e997f559333b738c8be5 /m4 | |
| parent | 4179284a3de093f3578a67c9b258a0d91eb4b6be (diff) | |
| parent | 912383451a4a394383a8e95240e3e98ee68faf72 (diff) | |
| download | automake-88ac92b2d5beaf4aee7d7bb4f3dc9a86da823550.tar.gz | |
Merge branch 'micro' into minor
* micro:
cleanup: refactor code to initialize DIST_COMMON
dist: ordering of files in DIST_COMMON is deterministic now
tests: refactor some tests on DIST_COMMON
maint: make output of 'gen-testsuite-part' deterministic
When computing lispdir, don't load emacs site wide init file.
PATH: quote $(PATH_SEPARATOR) as well
Improve detection of GNU make, avoiding "Arg list too long" errors.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/lispdir.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index 95a88da30..f1f2212f1 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -34,7 +34,7 @@ AC_DEFUN([AM_PATH_LISPDIR], # which is non-obvious for non-emacs users. # Redirecting /dev/null should help a bit; pity we can't detect "broken" # emacsen earlier and avoid running this altogether. - AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out]) + AC_RUN_LOG([$EMACS -batch -Q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out]) am_cv_lispdir=`sed -n \ -e 's,/$,,' \ -e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \ |