From: Chris Hanson Date: Fri, 8 Dec 2000 18:15:46 +0000 (+0000) Subject: Use autoconf for top-level Makefile. X-Git-Tag: 20090517-FFI~3086 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=176ba7a0d0b42ef63551169ff24785e0c1e0c974;p=mit-scheme.git Use autoconf for top-level Makefile. --- diff --git a/v7/src/Clean.sh b/v7/src/Clean.sh index 59451b3b8..8f7085d28 100755 --- a/v7/src/Clean.sh +++ b/v7/src/Clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: Clean.sh,v 1.2 2000/12/08 05:04:37 cph Exp $ +# $Id: Clean.sh,v 1.3 2000/12/08 18:15:46 cph Exp $ # # Copyright (c) 2000 Massachusetts Institute of Technology # @@ -33,9 +33,11 @@ case "${COMMAND}" in mostlyclean) ;; clean | distclean) + echo "rm -f lib/*.com" rm -f lib/*.com ;; maintainer-clean) + echo "rm -rf lib" rm -rf lib ;; *) @@ -44,6 +46,13 @@ maintainer-clean) ;; esac +case "${COMMAND}" in +distclean | maintainer-clean) + echo "rm -f Makefile config.cache config.log config.status" + rm -f Makefile config.cache config.log config.status + ;; +esac + for SUBDIR; do if test -x ${SUBDIR}/Clean.sh; then echo "making ${COMMAND} in ${SUBDIR}" diff --git a/v7/src/install-sh b/v7/src/install-sh new file mode 100755 index 000000000..e9de23842 --- /dev/null +++ b/v7/src/install-sh @@ -0,0 +1,251 @@ +#!/bin/sh +# +# install - install a program, script, or datafile +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +transformbasename="" +transform_arg="" +instcmd="$mvprog" +chmodcmd="$chmodprog 0755" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" +dir_arg="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + # this colon is to work around a 386BSD /bin/sh bug + : + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +else + true +fi + +if [ x"$dir_arg" != x ]; then + dst=$src + src="" + + if [ -d $dst ]; then + instcmd=: + chmodcmd="" + else + instcmd=mkdir + fi +else + +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +# might cause directories to be created, which would be especially bad +# if $src (and thus $dsttmp) contains '*'. + + if [ -f $src -o -d $src ] + then + true + else + echo "install: $src does not exist" + exit 1 + fi + + if [ x"$dst" = x ] + then + echo "install: no destination specified" + exit 1 + else + true + fi + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + + if [ -d $dst ] + then + dst="$dst"/`basename $src` + else + true + fi +fi + +## this sed command emulates the dirname command +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + +# Make sure that the destination directory exists. +# this part is taken from Noah Friedman's mkinstalldirs script + +# Skip lots of stat calls in the usual case. +if [ ! -d "$dstdir" ]; then +defaultIFS=' +' +IFS="${IFS-${defaultIFS}}" + +oIFS="${IFS}" +# Some sh's can't handle IFS=/ for some reason. +IFS='%' +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS="${oIFS}" + +pathcomp='' + +while [ $# -ne 0 ] ; do + pathcomp="${pathcomp}${1}" + shift + + if [ ! -d "${pathcomp}" ] ; + then + $mkdirprog "${pathcomp}" + else + true + fi + + pathcomp="${pathcomp}/" +done +fi + +if [ x"$dir_arg" != x ] +then + $doit $instcmd $dst && + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi +else + +# If we're going to rename the final executable, determine the name now. + + if [ x"$transformarg" = x ] + then + dstfile=`basename $dst` + else + dstfile=`basename $dst $transformbasename | + sed $transformarg`$transformbasename + fi + +# don't allow the sed command to completely eliminate the filename + + if [ x"$dstfile" = x ] + then + dstfile=`basename $dst` + else + true + fi + +# Make a temp file name in the proper directory. + + dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + + $doit $instcmd $src $dsttmp && + + trap "rm -f ${dsttmp}" 0 && + +# and set any options; do chmod last to preserve setuid bits + +# If any of these fail, we abort the whole thing. If we want to +# ignore errors from any of these, just make sure not to ignore +# errors from the above "$doit $instcmd $src $dsttmp" command. + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + +# Now rename the file to the real destination. + + $doit $rmcmd -f $dstdir/$dstfile && + $doit $mvcmd $dsttmp $dstdir/$dstfile + +fi && + + +exit 0 diff --git a/v7/src/microcode/Setup.sh b/v7/src/microcode/Setup.sh index 62cf04575..b4081ba05 100755 --- a/v7/src/microcode/Setup.sh +++ b/v7/src/microcode/Setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: Setup.sh,v 1.4 2000/12/08 18:08:02 cph Exp $ +# $Id: Setup.sh,v 1.5 2000/12/08 18:09:40 cph Exp $ # # Copyright (c) 2000 Massachusetts Institute of Technology # @@ -29,7 +29,7 @@ if [ ! -x configure ]; then echo "autoconf" autoconf fi -( cd cmpauxmd && $(MAKE) ) +( cd cmpauxmd && make ) if [ ! -f Makefile.in ]; then makegen/makeinit.sh fi diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in index 38c9c7d3f..ef7291486 100644 --- a/v7/src/microcode/makegen/Makefile.in.in +++ b/v7/src/microcode/makegen/Makefile.in.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in.in,v 1.11 2000/12/08 17:47:19 cph Exp $ +# $Id: Makefile.in.in,v 1.12 2000/12/08 18:08:42 cph Exp $ # # Copyright (c) 2000 Massachusetts Institute of Technology # @@ -218,9 +218,6 @@ psbtobin: $(psbtobin_OBJECTS) $(psbtobin_DEPENDENCIES) utabmd.bin: utabmd.scm scheme -compiler -eval '(sf "utabmd")' < /dev/null -setup: - ( cd cmpauxmd && $(MAKE) ) - tags: TAGS TAGS: etags -r '/^DEF[A-Za-z_ \t(]+"\([^"]+\)"/' *.[ch] diff --git a/v7/src/microcode/makegen/makeinit.sh b/v7/src/microcode/makegen/makeinit.sh index f143cc755..1e9ba4c70 100755 --- a/v7/src/microcode/makegen/makeinit.sh +++ b/v7/src/microcode/makegen/makeinit.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: makeinit.sh,v 1.7 2000/12/08 17:53:58 cph Exp $ +# $Id: makeinit.sh,v 1.8 2000/12/08 18:08:02 cph Exp $ # # Copyright (c) 2000 Massachusetts Institute of Technology # @@ -35,6 +35,8 @@ scheme -heap 2000 <