Fix bug: "make install" wasn't installing liarc bundles.

diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index 781578893d1bd561170dc0b78c3304ecbc7b8e98..2ead8f90a756aecf1aa67d54e07aa5b06e1fee78 100644 (file)
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.38 2007/05/14 16:50:33 cph Exp $
+# $Id: Makefile.in,v 1.39 2007/05/15 05:02:08 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -95,7 +95,7 @@ liarc-stamp: c-boot-compiler.com
        echo "done" > liarc.stamp
 
 
-all-c: liarc-compile-scheme
+all-liarc: liarc-compile-scheme
        $(MAKE) compile-microcode
        $(MAKE) compile-liarc-bundles
        rm -rf boot-lib
@@ -119,13 +119,19 @@ boot-lib/compiler.com: compile-microcode compile-liarc-boot-bundles
 
 compile-liarc-boot-bundles:
        @for BN in $(LIARC_BOOT_BUNDLES); do \
-           CMD="(cd $${BN} && $(MAKE) liarc-bundle)";\
+           CMD="(cd $${BN} && $(MAKE) compile-liarc-bundle)";\
            echo "$${CMD}"; eval "$${CMD}";\
        done
 
 compile-liarc-bundles:
        @for BN in $(LIARC_BUNDLES); do \
-           CMD="(cd $${BN} && $(MAKE) liarc-bundle)";\
+           CMD="(cd $${BN} && $(MAKE) compile-liarc-bundle)";\
+           echo "$${CMD}"; eval "$${CMD}";\
+       done
+
+install-liarc-bundles:
+       @for BN in $(LIARC_BUNDLES); do \
+           CMD="(cd $${BN} && $(MAKE) install-liarc-bundle)";\
            echo "$${CMD}"; eval "$${CMD}";\
        done
 
@@ -145,10 +151,12 @@ mostlyclean clean distclean maintainer-clean c-clean:
 tags TAGS:
        $(top_srcdir)/Tags.sh $(SUBDIRS)
 
-install:
+install: install-standard @INSTALL_LIARC_BUNDLES@
+
+install-standard:
        @for SUBDIR in $(INSTALLED_SUBDIRS); do \
            echo "Making $@ in $${SUBDIR}";\
-           ( cd $${SUBDIR}; $(MAKE) $@ ) || exit 1;\
+           (cd $${SUBDIR}; $(MAKE) install) || exit 1;\
        done
 
        $(mkinstalldirs) $(DESTDIR)$(AUXDIR)
@@ -162,4 +170,4 @@ install:
 .PHONY: liarc-dist all-c liarc-compile-scheme compile-liarc-boot-bundles
 .PHONY: compile-liarc-bundles native
 .PHONY: mostlyclean clean distclean maintainer-clean c-clean
-.PHONY: tags TAGS install
+.PHONY: tags TAGS install install-standard

diff --git a/v7/src/configure.ac b/v7/src/configure.ac
index 6f6c75f070acb8445550fe85bdfbf7e4a4e90c70..85bf2ed375b9c866d57034d967358cf8f678e048 100644 (file)
--- a/v7/src/configure.ac
+++ b/v7/src/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme], [7.7.91], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.13 2007/05/14 16:50:32 cph Exp $])
+AC_REVISION([$Id: configure.ac,v 1.14 2007/05/15 05:02:02 cph Exp $])
 AC_CONFIG_SRCDIR([microcode/boot.c])
 AC_PROG_MAKE_SET
 
@@ -39,13 +39,15 @@ fi
 
 case ${enable_native_code} in
 c)
-    ALL_TARGET=all-c
+    ALL_TARGET=all-liarc
     INSTALL_COM=:
+    INSTALL_LIARC_BUNDLES=install-liarc-bundles
     SYSTEM_BASE_NAME=mit-scheme-c
     ;;
 *)
     ALL_TARGET=all-native
     INSTALL_COM='$(INSTALL_DATA)'
+    INSTALL_LIARC_BUNDLES=
     SYSTEM_BASE_NAME=mit-scheme
     ;;
 esac
@@ -53,6 +55,7 @@ AUXDIR='$(libdir)'/${SYSTEM_BASE_NAME}
 
 AC_SUBST([ALL_TARGET])
 AC_SUBST([INSTALL_COM])
+AC_SUBST([INSTALL_LIARC_BUNDLES])
 AC_SUBST([AUXDIR])
 
 AC_PROG_INSTALL

diff --git a/v7/src/etc/utilities.scm b/v7/src/etc/utilities.scm
index c2224951f49387639f84825206cbb7d6abb8be54..5af1938c6ac0fc87ecf4283b744a29858c6c13ba 100644 (file)
--- a/v7/src/etc/utilities.scm
+++ b/v7/src/etc/utilities.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: utilities.scm,v 1.1 2007/05/14 16:50:50 cph Exp $
+$Id: utilities.scm,v 1.2 2007/05/15 05:02:14 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -38,14 +38,13 @@ USA.
                          (write-string "Generating bundle rule for " port)
                          (write-string bundle port))
        (lambda ()
-        (let ((names (bundle-files bundle)))
+        (let ((names (bundle-files bundle))
+              (so-file (string-append bundle ".so")))
           (call-with-output-file (string-append bundle "/Makefile-bundle")
             (lambda (port)
               (newline port)
               (let ((init-root (string-append bundle "-init")))
-                (write-rule port "liarc-bundle" (string-append bundle ".so"))
-                (newline port)
-                (write-rule port ".PHONY" "liarc-bundle")
+                (write-rule port "compile-liarc-bundle" so-file)
                 (newline port)
                 (write-rule port
                             (string-append bundle ".so")
@@ -64,6 +63,17 @@ USA.
                                "library"
                                init-root
                                "$^")
+                (newline port)
+                (write-rule port "install-liarc-bundle" so-file)
+                (write-command port
+                               "$(INSTALL_DATA)"
+                               "$^"
+                               "$(DESTDIR)$(AUXDIR)/lib/.")
+                (newline port)
+                (write-rule port
+                            ".PHONY"
+                            "compile-liarc-bundle"
+                            "install-liarc-bundle")
                 )))))))
    (map write-to-string bundles)))