From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 13 May 2021 13:54:25 +0000 (+0100)
Subject: Makefile.am: Override `data-dir' in all `dump-runlisp-image' calls.
X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/commitdiff_plain/7615305f00f2e44b3fab3ceb1b7f8d11764e68a0

Makefile.am: Override `data-dir' in all `dump-runlisp-image' calls.

... not just for `ecl'.  Nowadays we look for `eval.lisp' under
`${@data-dir}' by default in order to determine the Lisp version string.
---

diff --git a/Makefile.am b/Makefile.am
index 93aabc1..20c8dc3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,8 @@ doc_DATA		+= dump-runlisp-image.pdf
 EXTRA_DIST		+= dump-runlisp-image.1.in
 
 DUMP_RUNLISP_IMAGE	 = $(v_dump)./dump-runlisp-image -f -O$@ \
-				-c$(srcdir)/runlisp-base.conf
+				-c$(srcdir)/runlisp-base.conf \
+				-odata-dir=$(srcdir)
 
 v_dump			 = $(v_dump_@AM_V@)
 v_dump_			 = $(v_dump_@AM_DEFAULT_V@)
@@ -136,7 +137,7 @@ if DUMP_ECL
 IMAGES			+= ecl+asdf
 CLEANFILES		+= ecl+asdf
 ecl+asdf: dump-runlisp-image runlisp-base.conf dump-ecl
-	$(DUMP_RUNLISP_IMAGE) -odata-dir=$(srcdir) ecl
+	$(DUMP_RUNLISP_IMAGE) ecl
 endif
 
 if DUMP_CMUCL