diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-04-10 23:51:49 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-04-10 23:51:49 -0700 |
| commit | e088b01d290f69613cc3a555535baa1ed1b3e578 (patch) | |
| tree | a5ece2a0c8bf4c979343838f3221ef47cd4152de /admin | |
| parent | 536aa4668198bf4851356a8e3a57b7f8969014c3 (diff) | |
| download | emacs-e088b01d290f69613cc3a555535baa1ed1b3e578.tar.gz | |
Avoid EMACSDATA in user environment interfering with building
* admin/grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
* leim/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
* lisp/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
* test/automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH):
Unexport.
Fixes: debbugs:16429
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/grammars/Makefile.in | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index af0a15b8d3b..c28ff6853c2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris <rgm@gnu.org> + + * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-03-22 Glenn Morris <rgm@gnu.org> * quick-install-emacs (AVOID): Remove testfile and test-distrib. diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 827240a8d4e..b89df7116a6 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -28,6 +28,9 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +# Prevent any settings in the user environment causing problems. +unexport EMACSDATA EMACSDOC EMACSPATH + EMACS = ${top_builddir}/src/emacs emacs = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp |