2 files changed, 7 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index af0a15b8d3b..c28ff6853c2 100644
--- 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 827240a8d4e..b89df7116a6 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