From cd1b15b86742b9aadc1a733c8924bc344604836d Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Sun, 29 Dec 2002 18:01:39 +0000
Subject: [PATCH] Generate cus-load.el and finder-inf.el in the source
 directory.  Change dependencies on lisp files to explicitly use $(lisp).
 (compile-calc): Fix command substitution.

---
 lisp/ChangeLog   | 13 +++++++++++++
 lisp/Makefile.in | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 007fe405f87..f9de2fcdd36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-29  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.in: Generate cus-load.el and finder-inf.el in the
+	source directory.  Change dependencies on lisp files to explicitly
+	use $(lisp).
+	(compile-calc): Fix command substitution.
+	* cus-dep.el (generated-custom-dependencies-file): New variable.
+	(custom-make-dependencies): Use it instead of hardcoding
+	cus-load.el.
+	* finder.el (generated-finder-keywords-file): New variable.
+	(finder-compile-keywords): Use it instead of hardcoding
+	finder-inf.el.
+
 2002-12-28  Richard M. Stallman  <rms@gnu.org>
 
 	* info-look.el (info-lookup): Fix error message typo.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 0183b4ed58c..65bab7eb196 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -141,19 +141,19 @@ setwins_almost=subdirs=`find $$wd -type d -print`; \
 
 doit:
 
-cus-load.el:
+$(lisp)/cus-load.el:
 	touch $@
-custom-deps: cus-load.el doit
+custom-deps: $(lisp)/cus-load.el doit
 	wd=$(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
-	$(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins
+	$(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
 
 finder-data: doit
 	wd=$(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
-	$(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist $$wins
+	$(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
 
-loaddefs.el:
+$(lisp)/loaddefs.el:
 	echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
 	echo ";;" >> $@; echo ";;; Code:" >> $@
 	echo "" >> $@
@@ -163,12 +163,12 @@ loaddefs.el:
 	echo ";;; no-update-autoloads: t" >> $@
 	echo ";;; End:" >> $@
 	echo ";;; loaddefs.el ends here" >> $@
-autoloads: loaddefs.el doit
+autoloads: $(lisp)/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:
+$(lisp)/subdirs.el:
 	$(MAKE) $(MFLAGS) update-subdirs
 update-subdirs: doit
 	wd=$(lisp); $(setwins); \
@@ -193,7 +193,7 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
 
 .SUFFIXES: .elc .el
 
-.el.elc: subdirs.el
+.el.elc: $(lisp)/subdirs.el
 	-$(emacs) -f batch-byte-compile $<
 
 $(DONTCOMPILE:.el=.elc):
@@ -214,7 +214,7 @@ $(DONTCOMPILE:.el=.elc):
 # $(DONTCOMPILE) twice.  This is in case one of the files in DONTCOMPILE
 # is absent.  -stef
 
-compile: subdirs.el doit
+compile: $(lisp)/subdirs.el doit
 	find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
 	wd=$(lisp); $(setwins);	\
 	elpat=`echo $$wins | tr ' 	' '\012\012' | \
@@ -231,7 +231,7 @@ compile: subdirs.el doit
 
 # Compile all Lisp files, except those from DONTCOMPILE.  This
 # is like `compile' but compiles files unconditionally.
-compile-always: subdirs.el doit
+compile-always: $(lisp)/subdirs.el doit
 	# `|| true' prevents old Bash versions from getting confused
 	# by an error.
 	find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \
@@ -249,7 +249,7 @@ compile-always: subdirs.el doit
 	done
 
 compile-calc: 
-	for el in $(find $(lisp)/calc -name '*.el'); do \
+	for el in `find $(lisp)/calc -name '*.el'`; do \
 	  echo Compiling $$el; \
 	  $(emacs) -f batch-byte-compile $$el || exit 1; \
 	done
-- 
2.39.2