diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-11-02 12:50:41 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-11-02 12:50:41 -0700 |
| commit | 2ffcf5fef905da954dd191725d0359998754e108 (patch) | |
| tree | 4560e3a5fbe8802ed14c7bf86d832f6067e24d05 /test/automated/Makefile.in | |
| parent | 6a8b929e7fcf2e0866c3e4b891d5412322aec95c (diff) | |
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.
Diffstat (limited to 'test/automated/Makefile.in')
| -rw-r--r-- | test/automated/Makefile.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in index 17e37556a3..2fed6a188c 100644 --- a/test/automated/Makefile.in +++ b/test/automated/Makefile.in @@ -21,13 +21,9 @@ SHELL = @SHELL@ 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 @@ BYTE_COMPILE_EXTRA_FLAGS = # 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 @@ doit: .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)" |