[Emacs-diffs] trunk r114912: Minor simplifications for test/automated/Makefile

[Glenn Morris]

------------------------------------------------------------
revno: 114912
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 12:50:41 -0700
message:
  Minor simplifications for test/automated/Makefile
  
  * test/automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
  Remove variables.
  (emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc, abs_test.
  (lisp-compile): Use ../../lisp rather than $lisp.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-10-31 13:31:22 +0000
+++ b/test/ChangeLog    2013-11-02 19:50:41 +0000
@@ -1,3 +1,11 @@
+2013-11-02  Glenn Morris  <address@hidden>
+
+       * automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
+       Remove variables.
+       (emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc,
+       abs_test.
+       (lisp-compile): Use ../../lisp rather than $lisp.
+
 2013-10-31  Michael Albinus  <address@hidden>
 
        * automated/ert-tests.el (ert-test-stats-set-test-and-result):

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-10-23 06:22:54 +0000
+++ b/test/automated/Makefile.in        2013-11-02 19:50:41 +0000
@@ -21,13 +21,9 @@
 
 srcdir = @srcdir@
 abs_top_srcdir = @abs_top_srcdir@
-top_builddir = @top_builddir@
 abs_top_builddir = @abs_top_builddir@
 test = $(srcdir)
-abs_test = $(abs_srcdir)
 VPATH = $(srcdir)
-abs_lispsrc = $(abs_top_srcdir)/lisp
-lisp = $(top_builddir)/lisp
 
 # You can specify a different executable on the make command line,
 # e.g. "make EMACS=../src/emacs ...".
@@ -48,7 +44,7 @@
 # The example above is just for developers, it should not be used by default.
 
 # The actual Emacs command run in the targets below.
-emacs = EMACSLOADPATH="$(abs_lispsrc):$(abs_test)" LC_ALL=C "$(EMACS)" 
$(EMACSOPT)
+emacs = EMACSLOADPATH="$(abs_top_srcdir)/lisp:$(abs_srcdir)" LC_ALL=C 
"$(EMACS)" $(EMACSOPT)
 
 # Common command to find subdirectories
 setwins=subdirs=`find . -type d -print`; \
@@ -81,7 +77,7 @@
 .PHONY: lisp-compile compile-main compile compile-always
 
 lisp-compile:
-       cd "$(lisp)"; $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
+       cd ../../lisp && $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
 
 # In `compile-main' we could directly do
 #    ... | xargs $(MAKE) $(MFLAGS) EMACS="$(EMACS)"