EMACSLOADPATH in lisp/Makefile.in

[Eli Zaretskii]

This change in lisp/:

  2000-11-02  Ken Raeburn  <address@hidden>

        * Makefile.in (emacs): Set EMACSLOADPATH always.

breaks "make recompile" when $srcdir is ".", because it forces 
EMACSLOADPATH in several rules which previously didn't do that.

The following changes fix this for me.  Okay to commit?

2000-11-13  Eli Zaretskii  <address@hidden>

        * Makefile.in (custom-deps, finder-data, autoloads, recompile):
        Don't set EMACSLOADPATH.

*** lisp/Makefile.i~1   Mon Nov 13 15:54:00 2000
--- lisp/Makefile.in    Mon Nov 13 19:01:42 2000
***************
*** 87,100 ****
  custom-deps: cus-load.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
!       $(emacs) -l cus-dep -f custom-make-dependencies $$wins
  
  finder-inf.el:
        echo "(provide 'finder-inf)" >> $@
  finder-data: finder-inf.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
!       $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins
  
  loaddefs.el:
        echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
--- 87,100 ----
  custom-deps: cus-load.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
!       $(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins
  
  finder-inf.el:
        echo "(provide 'finder-inf)" >> $@
  finder-data: finder-inf.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
!       $(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist 
$$wins
  
  loaddefs.el:
        echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
***************
*** 109,115 ****
  autoloads: loaddefs.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
!       $(emacs) -l autoload --eval '(setq generated-autoload-file 
"$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
  
  subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
--- 109,115 ----
  autoloads: loaddefs.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
!       $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file 
"$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
  
  subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
***************
*** 175,181 ****
  # .elc is present.
  
  recompile: doit
!       $(emacs) -f batch-byte-recompile-directory $(lisp)
  
  # Prepare a bootstrap in the lisp subdirectory.  Build loaddefs.el,
  # because it's not sure it's up-to-date, and if it's not, that might
--- 175,181 ----
  # .elc is present.
  
  recompile: doit
!       $(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp)
  
  # Prepare a bootstrap in the lisp subdirectory.  Build loaddefs.el,
  # because it's not sure it's up-to-date, and if it's not, that might