From 65de43ada9373d0139a4dd583933d988a0f9b9a9 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 6 Nov 2013 00:37:01 -0800
Subject: [PATCH] Remove some directory-changing in lisp/Makefile

* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify.
(setwins_almost, setwins_for_subdirs): Don't assume called from srcdir.
(custom-deps, finder-data, autoloads, update-subdirs): No need to cd.
---
 lisp/ChangeLog   |  2 ++
 lisp/Makefile.in | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b475990d3..90f71bb01a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2013-11-06  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (setwins, setwins_almost, setwins_for_subdirs): Simplify.
+	(setwins_almost, setwins_for_subdirs): Don't assume called from srcdir.
+	(custom-deps, finder-data, autoloads, update-subdirs): No need to cd.
 
 2013-11-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 0c23264b06..9dd5a40de0 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -113,18 +113,18 @@ setwins=for file in `find . -type d -print`; do \
 	   case $$file in */.* ) ;; \
 		*) wins="$$wins$${wins:+ }$$file" ;; \
 	   esac; \
-        done
+	done
 
 # Find all subdirectories except `obsolete' and `term'.
-setwins_almost=for file in `find . -type d -print`; do \
-	   case $$file in */.* | */obsolete | */term ) ;; \
+setwins_almost=for file in `find ${srcdir} -type d -print`; do \
+	   case $$file in */obsolete | */term ) ;; \
 		*) wins="$$wins$${wins:+ }$$file" ;; \
 	   esac; \
         done
 
-# Find all subdirectories in which we might want to create subdirs.el
-setwins_for_subdirs=for file in `find . -type d -print`; do \
-	   case $$file in */.* | */cedet* ) ;; \
+# Find all subdirectories in which we might want to create subdirs.el.
+setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
+	   case $$file in */cedet* ) ;; \
 		*) wins="$$wins$${wins:+ }$$file" ;; \
 	   esac; \
         done
@@ -154,16 +154,19 @@ doit:
 $(lisp)/cus-load.el:
 	$(MAKE) $(MFLAGS) custom-deps
 custom-deps: doit
-	thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
+	$(setwins_almost); \
 	echo Directories: $$wins; \
-	$(emacs) --chdir $(lisp) -l cus-dep -f custom-make-dependencies $$wins
+	$(emacs) -l cus-dep \
+	  --eval '(setq generated-custom-dependencies-file "$(srcdir)/cus-load.el")' \
+	  -f custom-make-dependencies $$wins
 
 $(lisp)/finder-inf.el:
 	$(MAKE) $(MFLAGS) finder-data
 finder-data: doit
-	thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
+	$(setwins_almost); \
 	echo Directories: $$wins; \
-	$(emacs) --chdir $(lisp) -l finder \
+	$(emacs) -l finder \
+	  --eval '(setq generated-finder-keywords-file "$(srcdir)/finder-inf.el")' \
 	  -f finder-compile-keywords-make-dist $$wins
 
 # The chmod +w is to handle env var CVSREAD=1.
@@ -171,11 +174,11 @@ finder-data: doit
 # get confused when it compares file-names for equality.
 autoloads: $(LOADDEFS) doit
 	cd $(lisp) && chmod +w $(AUTOGEN_VCS)
-	thisdir=`pwd`; cd $(lisp) && $(setwins_almost); cd "$$thisdir"; \
+	$(setwins_almost); \
 	echo Directories: $$wins; \
-	$(emacs) --chdir $(lisp) -l autoload \
+	$(emacs) -l autoload \
 	    --eval '(setq autoload-builtin-package-versions t)' \
-	    --eval '(setq generated-autoload-file (expand-file-name "loaddefs.el"))' \
+	    --eval '(setq generated-autoload-file (expand-file-name "$(srcdir)/loaddefs.el"))' \
 	    -f batch-update-autoloads $$wins
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so
@@ -183,9 +186,9 @@ autoloads: $(LOADDEFS) doit
 $(lisp)/subdirs.el:
 	$(MAKE) $(MFLAGS) update-subdirs
 update-subdirs: doit
-	cd $(lisp) && $(setwins_for_subdirs); \
+	$(setwins_for_subdirs); \
 	for file in $$wins; do \
-	   ../build-aux/update-subdirs $$file; \
+	   $(srcdir)/../build-aux/update-subdirs $$file; \
 	done;
 
 .PHONY: updates bzr-update update-authors
-- 
2.20.1