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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ad68f464767c4e3d99d3cc4f249a54f314a8362..87eab43f502d9c38437ed2f4fddd1e4b1d92e27f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-15  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * Makefile.in (custom-deps, finder-data, autoloads, recompile):
+       Don't set EMACSLOADPATH.
+
 2000-11-15  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * textmodes/texinfo.el (texinfo-insert-@uref): Renamed from

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 22ab5f74e3bdcb3a0286aa7f537e73416d74e3da..fa48d9022d744eac658565828d78214fcb743756 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -87,14 +87,14 @@ cus-load.el:
 custom-deps: cus-load.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
-       $(emacs) -l cus-dep -f custom-make-dependencies $$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) -l finder -f finder-compile-keywords-make-dist $$wins
+       $(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist $$wins
 
 loaddefs.el:
        echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
@@ -109,7 +109,7 @@ loaddefs.el:
 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
+       $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
 
 subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
@@ -175,7 +175,7 @@ compile: backup-compiled-files compile-files
 # .elc is present.
 
 recompile: doit
-       $(emacs) -f batch-byte-recompile-directory $(lisp)
+       $(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