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 /leim | |
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 'leim')
-rw-r--r-- | leim/ChangeLog | 4 | ||||
-rw-r--r-- | leim/Makefile.in | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 73dee396618..6c3ec294269 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris <rgm@gnu.org> + + * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-01-20 Paul Eggert <eggert@cs.ucla.edu> Revert some of the CANNOT_DUMP fix (Bug#16494). diff --git a/leim/Makefile.in b/leim/Makefile.in index 6bfc3ae7048..293b052aeb3 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -29,6 +29,9 @@ srcdir=@srcdir@ # Where the generated files go. leimdir = ${srcdir}/../lisp/leim +# Prevent any settings in the user environment causing problems. +unexport EMACSDATA EMACSDOC EMACSPATH + # Which Emacs to use to convert TIT files to Emacs Lisp files, # and generate the file leim-list.el. EMACS = ../src/emacs |