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

[runlisp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e39d9bd..20c8dc3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,18 +54,6 @@ man_MANS             += runlisp.1
 doc_DATA               += runlisp.pdf
 EXTRA_DIST             += runlisp.1.in
 
-noinst_PROGRAMS                += old-runlisp
-old_runlisp_SOURCES     = old-runlisp.c
-old_runlisp_LDADD       = librunlisp.a
-
-noinst_PROGRAMS                += toy
-toy_SOURCES             = toy.c
-toy_LDADD               = librunlisp.a
-
-noinst_PROGRAMS                += hash
-hash_SOURCES            = hash.c
-hash_LDADD              = librunlisp.a
-
 ###--------------------------------------------------------------------------
 ### Additional machinery.
 
@@ -113,8 +101,9 @@ man_MANS            += dump-runlisp-image.1
 doc_DATA               += dump-runlisp-image.pdf
 EXTRA_DIST             += dump-runlisp-image.1.in
 
-DUMP_RUNLISP_IMAGE      = $(v_dump)./dump-runlisp-image \
-                               -f -c$(srcdir)/runlisp-base.conf -O$@
+DUMP_RUNLISP_IMAGE      = $(v_dump)./dump-runlisp-image -f -O$@ \
+                               -c$(srcdir)/runlisp-base.conf \
+                               -odata-dir=$(srcdir)
 
 v_dump                  = $(v_dump_@AM_V@)
 v_dump_                         = $(v_dump_@AM_DEFAULT_V@)
@@ -148,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