[Emacs-diffs] /srv/bzr/emacs/trunk r108886: * src/Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.

[Glenn Morris]

------------------------------------------------------------
revno: 108886
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-05 21:29:54 -0400
message:
  * src/Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.
  
  It has nothing to do with building Emacs, and no-one is likely to be
  paying attention to the result.  The CANNOT_DUMP branch was pointless,
  since it sets EMACSLOADPATH=$(lispsource) it is impossible for there
  to ever be any shadows.  The EMACSLOADPATH setting was probably necessary
  for emacs to work at all when uninstalled, given the way init_lread
  works for the CANNOT_DUMP case.  Since -batch implies -q, in the
  non-CANNOT_DUMP branch, any shadows could only come from site-lisp
  files.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-05 18:35:48 +0000
+++ b/src/ChangeLog     2012-07-06 01:29:54 +0000
@@ -1,3 +1,7 @@
+2012-07-06  Glenn Morris  <address@hidden>
+
+       * Makefile.in (emacs$(EXEEXT)): Don't check for load-path shadows.
+
 2012-07-05  Paul Eggert  <address@hidden>
 
        More xmalloc and related cleanup.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-06-26 01:05:39 +0000
+++ b/src/Makefile.in   2012-07-06 01:29:54 +0000
@@ -395,7 +395,6 @@
 $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
        cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
 
-## Does anyone ever pay attention to the load-path-shadows output here?
 ## The dumped Emacs is as functional and more efficient than
 ## bootstrap-emacs, so we replace the latter with the former.
 ## Strictly speaking, emacs does not depend directly on all of $lisp,
@@ -404,13 +403,10 @@
 emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el
        if test "$(CANNOT_DUMP)" = "yes"; then \
          ln -f temacs$(EXEEXT) emacs$(EXEEXT); \
-         EMACSLOADPATH=$(lispsource) ./emacs -batch \
-           -f list-load-path-shadows || true; \
        else \
          LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
          test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
          ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
-         ./emacs -batch -f list-load-path-shadows || true; \
        fi
 
 ## We run make-docfile twice because the command line may get too long