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

diff --git a/admin/ChangeLog b/admin/ChangeLog
index af0a15b8d3b0a8869f766f9ef9c6348be00b6b57..c28ff6853c2d075ca17d617c1542d305942e1772 100644 (file)
--- 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 827240a8d4ea94864d93b85886999420bf33b41f..b89df7116a66beacf3610bdc72905af3523d80a9 100644 (file)
--- 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
 

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 73dee39661821b404bac781819c98a1cfbc381c0..6c3ec294269d5cd6c9bc2c6657368b98e65261af 100644 (file)
--- 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 6bfc3ae70487c5bceba970fe604310a4bc6da85c..293b052aeb3e526f539a03fb984183eae38e4f18 100644 (file)
--- 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0e3d17613c795891aa3411097691782e892b4a9..0294155cad908a9400c9707ad00be2f51600d51b 100644 (file)
--- 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 50306ee6a20e7749eff2a55b5946c566113127f8..9673be30608740b9413dae52d061c91ba4d947e8 100644 (file)
--- 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)

diff --git a/test/ChangeLog b/test/ChangeLog
index 7f56fc4c6c3e5db85e86312cb87e91e2ed7846d7..504cf85c5ec5d4edaeef66503e47022b1b82c191 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+       * automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
+
 2014-04-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * automated/electric-tests.el: Fix spelling error in test name.

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 764b80ece93136c8d0e0c055896d44b6c333d185..9d9f60e3efebb9db943d77ad9f8f27adb3741c9a 100644 (file)
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -41,6 +41,9 @@ EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)"
 # Extra flags to pass to the byte compiler.
 BYTE_COMPILE_EXTRA_FLAGS =
 
+# 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= LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT)