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

2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0e3d17613c..0294155cad9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.  (Bug#16429)
+
 2014-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         Ediff's overlay priorities cause more trouble than they solve.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 50306ee6a20..9673be30608 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -107,6 +107,9 @@ COMPILE_FIRST = \
         $(lisp)/emacs-lisp/bytecomp.elc \
         $(lisp)/emacs-lisp/autoload.elc
 
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSPATH
+
 # The actual Emacs command run in the targets below.
 # Prevent any setting of EMACSLOADPATH in user environment causing problems.
 emacs = EMACSLOADPATH= '$(EMACS)' $(EMACSOPT)