------------------------------------------------------------
revno: 116968
fixes bug: http://debbugs.gnu.org/16429
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Thu 2014-04-10 23:51:49 -0700
message:
  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.
diff:
=== modified file 'admin/ChangeLog'
--- admin/ChangeLog	2014-03-22 22:52:47 +0000
+++ admin/ChangeLog	2014-04-11 06:51:49 +0000
@@ -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.

=== modified file 'admin/grammars/Makefile.in'
--- admin/grammars/Makefile.in	2014-01-01 07:43:34 +0000
+++ admin/grammars/Makefile.in	2014-04-11 06:51:49 +0000
@@ -28,6 +28,9 @@
 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
 

=== modified file 'leim/ChangeLog'
--- leim/ChangeLog	2014-01-26 00:47:40 +0000
+++ leim/ChangeLog	2014-04-11 06:51:49 +0000
@@ -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).

=== modified file 'leim/Makefile.in'
--- leim/Makefile.in	2014-01-20 07:56:28 +0000
+++ leim/Makefile.in	2014-04-11 06:51:49 +0000
@@ -29,6 +29,9 @@
 # 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

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-04-11 06:43:20 +0000
+++ lisp/ChangeLog	2014-04-11 06:51:49 +0000
@@ -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.

=== modified file 'lisp/Makefile.in'
--- lisp/Makefile.in	2014-03-29 00:53:32 +0000
+++ lisp/Makefile.in	2014-04-11 06:51:49 +0000
@@ -107,6 +107,9 @@
 	$(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)

=== modified file 'test/ChangeLog'
--- test/ChangeLog	2014-04-11 06:43:20 +0000
+++ test/ChangeLog	2014-04-11 06:51:49 +0000
@@ -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.

=== modified file 'test/automated/Makefile.in'
--- test/automated/Makefile.in	2014-01-01 07:43:34 +0000
+++ test/automated/Makefile.in	2014-04-11 06:51:49 +0000
@@ -41,6 +41,9 @@
 # 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)