From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 22 Sep 2015 10:27:11 +0000 (+0100)
Subject: src/Makefile.am: Reinstate ASDF output translations.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/dcb84c9fb8babcd4e0f54a4c533fb6b86ce74e4b

src/Makefile.am: Reinstate ASDF output translations.

These were mistakenly removed during the version number
hacking (58a9509...).  It's important to separate the good command-line
build from builds done inside a resident Lisp for hacking, because the
latter might be full of debug pessimizations.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b23dd8..28804c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,9 @@ nobase_dist_pkglispsrc_DATA = $(LISP_SOURCES)
 LISP_SOURCES		 =
 SYSDEFS			 =
 
+ASDF_ENV		 = \
+	ASDF_OUTPUT_TRANSLATIONS=$$(cd $(srcdir); pwd):$(abs_builddir):
+
 ###--------------------------------------------------------------------------
 ### The source files.
 
@@ -120,7 +123,7 @@ sod-frontend.asd: sod-frontend.asd.in Makefile
 bin_PROGRAMS		+= sod
 sod_SOURCES		 =
 sod: $(LISP_SOURCES) sod.asd sod-frontend.asd auto.lisp
-	$(V_DUMP)$(CL_LAUNCH) -o sod -d ! -l $(LISPSYS) +I \
+	$(V_DUMP)$(ASDF_ENV) $(CL_LAUNCH) -o sod -d ! -l $(LISPSYS) +I \
 		-s sod-frontend -r sod-frontend:main
 
 ###--------------------------------------------------------------------------
@@ -150,7 +153,7 @@ sod-test.asd: sod-test.asd.in Makefile
 
 ## Running the Lisp tests.
 check-local: sod sod-test.asd
-	$(V_TEST)$(CL_LAUNCH) -l $(LISPSYS) -s sod-test +I \
+	$(V_TEST)$(ASDF_ENV) $(CL_LAUNCH) -l $(LISPSYS) -s sod-test +I \
 		-i '(handler-case (asdf:test-system "sod") ;\
 		      (error (cond) ;\
 			(format *error-output* "ERR: ~A~%" cond) ;\