From e088b01d290f69613cc3a555535baa1ed1b3e578 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 10 Apr 2014 23:51:49 -0700 Subject: [PATCH] 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 --- admin/ChangeLog | 4 ++++ admin/grammars/Makefile.in | 3 +++ leim/ChangeLog | 4 ++++ leim/Makefile.in | 3 +++ lisp/ChangeLog | 4 ++++ lisp/Makefile.in | 3 +++ test/ChangeLog | 4 ++++ test/automated/Makefile.in | 3 +++ 8 files changed, 28 insertions(+) diff --git a/admin/ChangeLog b/admin/ChangeLog index af0a15b8d3..c28ff6853c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-03-22 Glenn Morris * quick-install-emacs (AVOID): Remove testfile and test-distrib. diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 827240a8d4..b89df7116a 100644 --- 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 73dee39661..6c3ec29426 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-01-20 Paul Eggert Revert some of the CANNOT_DUMP fix (Bug#16494). diff --git a/leim/Makefile.in b/leim/Makefile.in index 6bfc3ae704..293b052aeb 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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0e3d17613..0294155cad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. (Bug#16429) + 2014-04-11 Stefan Monnier Ediff's overlay priorities cause more trouble than they solve. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 50306ee6a2..9673be3060 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) diff --git a/test/ChangeLog b/test/ChangeLog index 7f56fc4c6c..504cf85c5e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2014-04-11 Glenn Morris + + * automated/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. + 2014-04-11 Paul Eggert * automated/electric-tests.el: Fix spelling error in test name. diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index 764b80ece9..9d9f60e3ef 100644 --- 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) -- 2.20.1