From 1f43ed41773a6bcdc7fc9437d73b801a2c62396e Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 2 Nov 2013 12:56:54 -0700
Subject: [PATCH] * automated/Makefile.in (test): Remove variable.
 (compile-main, compile-clean, compile-always, bootstrap-clean) (check): Use
 srcdir rather than $test.  Check cd return value. (compile-always): Depend on
 bootstrap-clean.

---
 test/ChangeLog             |  7 +++++--
 test/automated/Makefile.in | 14 ++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/ChangeLog b/test/ChangeLog
index 8d91e334b78..080cbb8eea7 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,10 +1,13 @@
 2013-11-02  Glenn Morris  <rgm@gnu.org>
 
-	* automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
-	Remove variables.
+	* automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp)
+	(test): Remove variables.
 	(emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc,
 	abs_test.
 	(lisp-compile): Use ../../lisp rather than $lisp.
+	(compile-main, compile-clean, compile-always, bootstrap-clean)
+	(check): Use srcdir rather than $test.  Check cd return value.
+	(compile-always): Depend on bootstrap-clean.
 
 2013-10-31  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 2fed6a188ce..056f024fdbf 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -22,7 +22,6 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 abs_top_srcdir = @abs_top_srcdir@
 abs_top_builddir = @abs_top_builddir@
-test = $(srcdir)
 VPATH = $(srcdir)
 
 # You can specify a different executable on the make command line,
@@ -96,7 +95,7 @@ compile-targets: $(TARGETS)
 # Compile all the Elisp files that need it.  Beware: it approximates
 # `no-byte-compile', so watch out for false-positives!
 compile-main: compile-clean lisp-compile
-	@(cd $(test); $(setwins); \
+	@(cd $(srcdir) && $(setwins); \
 	els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
 	for el in $$els; do \
 	  test -f $$el || continue; \
@@ -110,7 +109,7 @@ compile-main: compile-clean lisp-compile
 .PHONY: compile-clean
 # Erase left-over .elc files that do not have a corresponding .el file.
 compile-clean:
-	@cd $(test); $(setwins); \
+	@cd $(srcdir) && $(setwins); \
 	elcs=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.elc |g'`; \
 	for el in $$(echo $$elcs | sed -e 's/\.elc/\.el/g'); do \
 	  if test -f "$$el" -o \! -f "$${el}c"; then :; else \
@@ -131,20 +130,19 @@ compile: $(LOADDEFS) autoloads compile-first
 # Compile all Lisp files.  This is like `compile' but compiles files
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
-compile-always: doit
-	cd $(test); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
+compile-always: bootstrap-clean
 	$(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
 
 bootstrap-clean:
-	cd $(test); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
+	-cd $(srcdir) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
 
 distclean:
-	-rm -f ./Makefile
+	rm -f Makefile
 
 maintainer-clean: distclean bootstrap-clean
 
 check: compile-main
-	@(cd $(test); $(setwins); \
+	@(cd $(srcdir) && $(setwins); \
 	pattern=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
 	for el in $$pattern; do \
 	  test -f $$el || continue; \
-- 
2.39.2