From b127ff51c35a173c8da09022dbb7b27bf45e7864 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 30 Apr 2007 07:08:54 +0000 Subject: [PATCH] Change liarc system to use "mit-scheme-c" as name of executable and of library directory. Otherwise "mit-scheme" is used as before. The installer needs some work to deal with symlinks for the "scheme" and "bchscheme" names. --- v7/src/configure.ac | 14 +++++----- v7/src/microcode/configure.ac | 6 ++++- v7/src/microcode/makegen/Makefile.in.in | 36 +++++-------------------- 3 files changed, 20 insertions(+), 36 deletions(-) diff --git a/v7/src/configure.ac b/v7/src/configure.ac index d10ced85d..01ebc2466 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.8 2007/04/29 18:01:44 cph Exp $]) +AC_REVISION([$Id: configure.ac,v 1.9 2007/04/30 07:08:43 cph Exp $]) AC_CONFIG_SRCDIR([microcode/boot.c]) AC_PROG_MAKE_SET @@ -42,17 +42,19 @@ c) COMPILE_SCRIPT=c-compile.sh BUILD_BANDS_SCRIPT=c-build-bands.sh INSTALL_COM=: + SYSTEM_BASE_NAME=mit-scheme-c ;; *) COMPILE_SCRIPT=compile.sh BUILD_BANDS_SCRIPT=build-bands.sh INSTALL_COM='$(INSTALL_DATA)' + SYSTEM_BASE_NAME=mit-scheme ;; esac -AC_SUBST(COMPILE_SCRIPT) -AC_SUBST(BUILD_BANDS_SCRIPT) -AC_SUBST(INSTALL_COM) +AC_SUBST([COMPILE_SCRIPT]) +AC_SUBST([BUILD_BANDS_SCRIPT]) +AC_SUBST([INSTALL_COM]) AC_PROG_INSTALL AC_PROG_LN_S @@ -61,8 +63,8 @@ then INSTALL="${INSTALL} --preserve-timestamps" fi -AUXDIR=${libdir}/mit-scheme -AC_SUBST(AUXDIR) +AUXDIR='$(libdir)'/${SYSTEM_BASE_NAME} +AC_SUBST([AUXDIR]) AC_CONFIG_SUBDIRS([microcode compiler]) AC_CONFIG_FILES([ diff --git a/v7/src/microcode/configure.ac b/v7/src/microcode/configure.ac index 76dd44fe7..9510568f8 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.43 2007/04/29 18:38:26 cph Exp $]) +AC_REVISION([$Id: configure.ac,v 1.44 2007/04/30 07:08:49 cph Exp $]) AC_CONFIG_SRCDIR([boot.c]) AC_CONFIG_HEADERS([config.h]) AC_PROG_MAKE_SET @@ -195,6 +195,7 @@ MODULE_CFLAGS="-DCOMPILE_AS_MODULE" MODULE_LDFLAGS= LIARC_VARS=/dev/null LIARC_RULES=/dev/null +SYSTEM_BASE_NAME=mit-scheme dnl Checks for programs. AC_PROG_CC @@ -930,10 +931,12 @@ c) OPTIONAL_BASES="${OPTIONAL_BASES} cmpauxmd unstackify compinit" LIARC_VARS=liarc-vars LIARC_RULES=liarc-rules + SYSTEM_BASE_NAME=mit-scheme-c ;; svm1) AC_MSG_RESULT([yes, using portable SVM code]) OPTIONAL_BASES="${OPTIONAL_BASES} svm1-interp" + SYSTEM_BASE_NAME=mit-scheme-svm ;; *) AC_MSG_RESULT([yes, for ${SCM_ARCH}]) @@ -987,6 +990,7 @@ AC_SUBST([MODULE_CFLAGS]) AC_SUBST([MODULE_LDFLAGS]) AC_SUBST_FILE([LIARC_VARS]) AC_SUBST_FILE([LIARC_RULES]) +AC_SUBST([SYSTEM_BASE_NAME]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in index a9ee12d45..38c3ee67a 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.48 2007/04/22 16:41:01 cph Exp $ +# $Id: Makefile.in.in,v 1.49 2007/04/30 07:08:54 cph Exp $ # # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, # 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -64,7 +64,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs # **** Tool configuration **** -AUXDIR = $(libdir)/mit-scheme +SYSTEM_BASE_NAME = @SYSTEM_BASE_NAME@ +AUXDIR = $(libdir)/$(SYSTEM_BASE_NAME) CC = @CC@ M4 = $(srcdir)/makegen/m4.sh @@ -117,8 +118,6 @@ MODULE_LIBS = -lc # **** Program definitions **** -bin_PROGRAMS = scheme -aux_PROGRAMS = aux_LIBS = $(MODULE_TARGETS) aux_DATA = utabmd.bin EXTRA_PROGRAMS = findprim @@ -135,7 +134,7 @@ findprim_DEPENDENCIES = findprim_LDFLAGS = findprim_LIBS = $(LIBS) -ALL_PROGRAMS = $(bin_PROGRAMS) $(aux_PROGRAMS) +ALL_PROGRAMS = scheme ALL_LIBS = $(aux_LIBS) ALL_DATA = $(aux_DATA) @@ -238,30 +237,9 @@ c-clean: -rm -f $(C_CLEAN_FILES) -rm -rf autom4te.cache -install: install-binPROGRAMS install-auxPROGRAMS install-auxLIBS \ - install-auxDATA $(LIARC_INSTALL) - -install-binPROGRAMS: $(bin_PROGRAMS) +install: install-auxLIBS install-auxDATA $(LIARC_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; \ - for p in $$list; do \ - if test -f $$p; then \ - echo "$(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/."; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/.; \ - fi; \ - done - -rm -f $(DESTDIR)$(bindir)/bchscheme - ln -s scheme $(DESTDIR)$(bindir)/bchscheme - -install-auxPROGRAMS: $(aux_PROGRAMS) - $(mkinstalldirs) $(DESTDIR)$(AUXDIR) - @list='$(aux_PROGRAMS)'; \ - for p in $$list; do \ - if test -f $$p; then \ - echo "$(INSTALL_PROGRAM) $$p $(DESTDIR)$(AUXDIR)/."; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(AUXDIR)/.; \ - fi; \ - done + $(INSTALL_PROGRAM) scheme $(DESTDIR)$(bindir)/$(SYSTEM_BASE_NAME) install-auxLIBS: $(aux_LIBS) $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/lib @@ -285,7 +263,7 @@ install-auxDATA: $(aux_DATA) .PHONY: default-target .PHONY: all tags TAGS mostlyclean clean distclean maintainer-clean c-clean -.PHONY: install install-binPROGRAMS install-auxPROGRAMS install-auxDATA +.PHONY: install install-auxLIBS install-auxDATA # **** File dependencies **** -- 2.25.1