From 2d8832c5d8bed5e5a50ceef4cfbcd234d4e72696 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 23 Jun 2007 05:47:44 +0000
Subject: [PATCH] For native system, install executable as mit-scheme-native
 rather than just mit-scheme.

---
 v7/src/configure.ac                     |  8 ++++----
 v7/src/microcode/configure.ac           | 14 +++++++++-----
 v7/src/microcode/makegen/Makefile.in.in | 11 ++++++-----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/v7/src/configure.ac b/v7/src/configure.ac
index ca3f53ae8..ca75bbfb4 100644
--- 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.18 2007/06/21 22:39:21 cph Exp $])
+AC_REVISION([$Id: configure.ac,v 1.19 2007/06/23 05:47:42 cph Exp $])
 AC_CONFIG_SRCDIR([microcode/boot.c])
 AC_PROG_MAKE_SET
 
@@ -38,16 +38,16 @@ c)
     ALL_TARGET=all-liarc
     INSTALL_COM=:
     INSTALL_LIARC_BUNDLES=install-liarc-bundles
-    SYSTEM_BASE_NAME=mit-scheme-c
+    AUXDIR_NAME=mit-scheme-c
     ;;
 *)
     ALL_TARGET=all-native
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
-    SYSTEM_BASE_NAME=mit-scheme
+    AUXDIR_NAME=mit-scheme
     ;;
 esac
-AUXDIR='$(libdir)'/${SYSTEM_BASE_NAME}
+AUXDIR='$(libdir)'/${AUXDIR_NAME}
 
 AC_SUBST([ALL_TARGET])
 AC_SUBST([INSTALL_COM])
diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac
index aa73cc8a7..19aba4792 100644
--- a/v7/src/microcode/configure.ac
+++ b/v7/src/microcode/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme microcode], [15.1], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.53 2007/06/22 18:46:53 riastradh Exp $])
+AC_REVISION([$Id: configure.ac,v 1.54 2007/06/23 05:47:43 cph Exp $])
 AC_CONFIG_SRCDIR([boot.c])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
@@ -193,7 +193,8 @@ LIARC_VARS=/dev/null
 LIARC_RULES=/dev/null
 AUX_PROGRAMS=
 AUX_DATA=utabmd.bin
-SYSTEM_BASE_NAME=mit-scheme
+AUXDIR_NAME=mit-scheme
+EXE_NAME=mit-scheme-native
 INSTALL_INCLUDE=
 
 dnl Checks for programs.
@@ -936,13 +937,15 @@ c)
     LIARC_RULES=liarc-rules
     AUX_PROGRAMS="gen-nonce extract-liarc-decls"
     AUX_DATA=
-    SYSTEM_BASE_NAME=mit-scheme-c
+    AUXDIR_NAME=mit-scheme-c
+    EXE_NAME=mit-scheme-c
     INSTALL_INCLUDE=install-include
     ;;
 svm1)
     AC_MSG_RESULT([yes, using portable SVM code])
     OPTIONAL_BASES="${OPTIONAL_BASES} svm1-interp"
-    SYSTEM_BASE_NAME=mit-scheme-svm
+    AUXDIR_NAME=mit-scheme-svm
+    EXE_NAME=mit-scheme-svm
     ;;
 *)
     AC_MSG_RESULT([yes, for ${SCM_ARCH}])
@@ -998,7 +1001,8 @@ AC_SUBST_FILE([LIARC_VARS])
 AC_SUBST_FILE([LIARC_RULES])
 AC_SUBST([AUX_PROGRAMS])
 AC_SUBST([AUX_DATA])
-AC_SUBST([SYSTEM_BASE_NAME])
+AC_SUBST([AUXDIR_NAME])
+AC_SUBST([EXE_NAME])
 AC_SUBST([INSTALL_INCLUDE])
 AC_SUBST([CCLD])
 
diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in
index e87f9ed59..73221e6d4 100644
--- a/v7/src/microcode/makegen/Makefile.in.in
+++ b/v7/src/microcode/makegen/Makefile.in.in
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 #
-# $Id: Makefile.in.in,v 1.59 2007/06/22 02:31:22 cph Exp $
+# $Id: Makefile.in.in,v 1.60 2007/06/23 05:47:44 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -64,8 +64,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 # **** Tool configuration ****
 
-SYSTEM_BASE_NAME = @SYSTEM_BASE_NAME@
-AUXDIR = $(libdir)/$(SYSTEM_BASE_NAME)
+AUXDIR_NAME = @AUXDIR_NAME@
+EXE_NAME = @EXE_NAME@
+AUXDIR = $(libdir)/$(AUXDIR_NAME)
 
 CC = @CC@
 CCLD = @CCLD@
@@ -242,8 +243,8 @@ c-clean: clean
 
 install: install-auxPROGRAMS install-auxLIBS install-auxDATA @INSTALL_INCLUDE@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) scheme $(DESTDIR)$(bindir)/$(SYSTEM_BASE_NAME)
-	../etc/install-bin-symlinks.sh $(DESTDIR)$(bindir) $(SYSTEM_BASE_NAME)
+	$(INSTALL_PROGRAM) scheme $(DESTDIR)$(bindir)/$(EXE_NAME)
+	../etc/install-bin-symlinks.sh $(DESTDIR)$(bindir) $(EXE_NAME)
 
 install-auxPROGRAMS: $(aux_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(AUXDIR)
-- 
2.25.1