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 7b23dd8c84f3c783cdb36438765e6ccf8b67dd10..28804c6a3ebaaf4677abdfa9a5394d10832c239d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,9 @@ nobase_dist_pkglispsrc_DATA = $(LISP_SOURCES)
 LISP_SOURCES            =
 SYSDEFS                         =
 
 LISP_SOURCES            =
 SYSDEFS                         =
 

+ASDF_ENV                = \
+       ASDF_OUTPUT_TRANSLATIONS=$$(cd $(srcdir); pwd):$(abs_builddir):
+

 ###--------------------------------------------------------------------------
 ### The source files.
 
 ###--------------------------------------------------------------------------
 ### 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
 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
 
 ###--------------------------------------------------------------------------
                -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
 
 ## 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) ;\
                -i '(handler-case (asdf:test-system "sod") ;\
                      (error (cond) ;\
                        (format *error-output* "ERR: ~A~%" cond) ;\