Commit e088b01d authored by Glenn Morris's avatar Glenn Morris

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
parent 536aa466
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.
......
......@@ -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
......
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).
......
......@@ -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
......
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.
......
......@@ -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)
......
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.
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment