Avoid EMACSDATA in user environment interfering with building

[bpt/emacs.git] / test / automated / Makefile.in

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index a8adaf4..9d9f60e 100644 (file)
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -22,7 +22,7 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
-PATH_SEPARATOR = @PATH_SEPARATOR@
+SEPCHAR = @SEPCHAR@
 
 # Empty for all systems except MinGW, where xargs needs an explicit
 # limitation.
@@ -36,15 +36,17 @@ EMACS = ../../src/emacs
 # Command line flags for Emacs.
 # Apparently MSYS bash would convert "-L :" to "-L ;" anyway,
 # but we might as well be explicit.
-EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(PATH_SEPARATOR)$(srcdir)"
+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 = unset EMACSLOADPATH; \
-       LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT)
+emacs = EMACSLOADPATH= LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT)
 
 # Common command to find subdirectories
 setwins=for file in `find $(srcdir) -type d -print`; do \