[Emacs-diffs] trunk r114925: Unset EMACSLOADPATH in some Makefiles rather than setting it to the default

[Glenn Morris]

------------------------------------------------------------
revno: 114925
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-11-03 11:25:29 -0800
message:
  Unset EMACSLOADPATH in some Makefiles rather than setting it to the default
  
  * leim/Makefile.in (abs_srcdir): Remove.
  (RUN_EMACS): Unset EMACSLOADPATH.
  
  * lisp/Makefile.in (abs_srcdir): Remove.
  (emacs): Unset EMACSLOADPATH.
modified:
  leim/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1629
  leim/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1200
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2013-11-02 20:30:13 +0000
+++ b/leim/ChangeLog    2013-11-03 19:25:29 +0000
@@ -1,3 +1,8 @@
+2013-11-03  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_srcdir): Remove.
+       (RUN_EMACS): Unset EMACSLOADPATH.
+
 2013-11-02  Glenn Morris  <address@hidden>
 
        * Makefile.in (buildlisppath): Remove.

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2013-11-02 20:30:13 +0000
+++ b/leim/Makefile.in  2013-11-03 19:25:29 +0000
@@ -25,15 +25,15 @@
 
 # Here are the things that we expect ../configure to edit.
 address@hidden@
address@hidden@
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
 EMACS = ../src/emacs
 
 # How to run Emacs.
-RUN_EMACS = EMACSLOADPATH="${abs_srcdir}/../lisp" LC_ALL=C \
-       "${EMACS}" -batch --no-site-file --no-site-lisp
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+RUN_EMACS = unset EMACSLOADPATH; LC_ALL=C "${EMACS}" -batch \
+       --no-site-file --no-site-lisp
 
 MKDIR_P = @MKDIR_P@
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-02 23:39:49 +0000
+++ b/lisp/ChangeLog    2013-11-03 19:25:29 +0000
@@ -1,3 +1,8 @@
+2013-11-03  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_srcdir): Remove.
+       (emacs): Unset EMACSLOADPATH.
+
 2013-11-02  Glenn Morris  <address@hidden>
 
        * Makefile.in (EMACS): Use a relative filename.

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2013-11-02 23:39:49 +0000
+++ b/lisp/Makefile.in  2013-11-03 19:25:29 +0000
@@ -20,7 +20,6 @@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
 top_srcdir = @top_srcdir@
 lisp = $(srcdir)
 VPATH = $(srcdir)
@@ -106,8 +105,8 @@
        $(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`; \