Unset EMACSLOADPATH in some Makefiles rather than setting it to the default

[bpt/emacs.git] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 1ac6338..7b0206a 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -20,9 +20,7 @@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
 top_srcdir = @top_srcdir@
-abs_top_builddir = @abs_top_builddir@
 lisp = $(srcdir)
 VPATH = $(srcdir)
 
@@ -107,8 +105,8 @@ COMPILE_FIRST = \
        $(lisp)/emacs-lisp/autoload.elc
 
 # The actual Emacs command run in the targets below.
-
-emacs = EMACSLOADPATH="$(abs_srcdir)" LC_ALL=C "$(EMACS)" $(EMACSOPT)
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+emacs = unset EMACSLOADPATH; LC_ALL=C "$(EMACS)" $(EMACSOPT)
 
 # Common command to find subdirectories
 setwins=subdirs=`find . -type d -print`; \
@@ -219,13 +217,11 @@ lisptagsfiles2 = $(srcdir)/*/*.el
 lisptagsfiles3 = $(srcdir)/*/*/*.el
 lisptagsfiles4 = $(srcdir)/*/*/*/*.el
 
-## Apparently the echo | sed | xargs is to stop the command line
-## getting too long on MS Windows.  It will make no difference on
-## POSIX systems, where the shell does the globbing right away, before
-## passing the expanded arguments to echo.
-## The POSIX way would be to use find in a similar way to compile-main.
-## But maybe this is not even necessary any more now that this uses
-## relative filenames.
+## The echo | sed | xargs is to stop the command line getting too long
+## on MS Windows, when the MSYS Bash passes it to a MinGW compiled
+## etags.  It might be better to use find in a similar way to
+## compile-main.  But maybe this is not even necessary any more now
+## that this uses relative filenames.
 TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
        rm -f $@
        touch $@