[Emacs-diffs] trunk r116968: Avoid EMACSDATA in user environment interfering with building

[Glenn Morris]

------------------------------------------------------------
revno: 116968
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16429
committer: Glenn Morris <address@hidden>
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.
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/grammars/Makefile.in     makefile.in-20131130001301-3lt9hqzbk9kx1z05-1
  leim/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1629
  leim/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1200
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-03-22 22:52:47 +0000
+++ b/admin/ChangeLog   2014-04-11 06:51:49 +0000
@@ -1,3 +1,7 @@
+2014-04-11  Glenn Morris  <address@hidden>
+
+       * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
+
 2014-03-22  Glenn Morris  <address@hidden>
 
        * quick-install-emacs (AVOID): Remove testfile and test-distrib.

=== modified file 'admin/grammars/Makefile.in'
--- a/admin/grammars/Makefile.in        2014-01-01 07:43:34 +0000
+++ b/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'
--- a/leim/ChangeLog    2014-01-26 00:47:40 +0000
+++ b/leim/ChangeLog    2014-04-11 06:51:49 +0000
@@ -1,3 +1,7 @@
+2014-04-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
+
 2014-01-20  Paul Eggert  <address@hidden>
 
        Revert some of the CANNOT_DUMP fix (Bug#16494).

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2014-01-20 07:56:28 +0000
+++ b/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'
--- a/lisp/ChangeLog    2014-04-11 06:43:20 +0000
+++ b/lisp/ChangeLog    2014-04-11 06:51:49 +0000
@@ -1,3 +1,7 @@
+2014-04-11  Glenn Morris  <address@hidden>
+
+       * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.  (Bug#16429)
+
 2014-04-11  Stefan Monnier  <address@hidden>
 
        Ediff's overlay priorities cause more trouble than they solve.

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2014-03-29 00:53:32 +0000
+++ b/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'
--- a/test/ChangeLog    2014-04-11 06:43:20 +0000
+++ b/test/ChangeLog    2014-04-11 06:51:49 +0000
@@ -1,3 +1,7 @@
+2014-04-11  Glenn Morris  <address@hidden>
+
+       * automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.
+
 2014-04-11  Paul Eggert  <address@hidden>
 
        * automated/electric-tests.el: Fix spelling error in test name.

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2014-01-01 07:43:34 +0000
+++ b/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)