Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru

[bpt/emacs.git] / admin / grammars / Makefile.in

diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index 827240a..b89df71 100644 (file)
--- 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