From 731d5dd65a7b94b5d49d1663d9b60c3a406ce38c Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Sat, 28 May 2005 09:00:34 +0000 Subject: [PATCH] 0.9.1.2: Merge a couple of cleanup fixes that I've had tagged for months if not years. --- install.sh | 4 ++-- make.sh | 8 ++++---- src/runtime/GNUmakefile | 2 +- version.lisp-expr | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index d1a19c5..8773aa0 100644 --- a/install.sh +++ b/install.sh @@ -98,8 +98,8 @@ cp doc/sbcl.1 $BUILD_ROOT$MAN_DIR/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/s for info in doc/manual/*.info do cp $info $BUILD_ROOT$INFO_DIR/ \ - && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info`" \ - && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` > /dev/null 2>&1 \ + && echo -n " info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir" \ + && ( install-info $BUILD_ROOT$INFO_DIR/`basename $info` $BUILD_ROOT$INFO_DIR/dir > /dev/null 2>&1 \ || echo -n " (could not add to system catalog)" ) \ && echo done diff --git a/make.sh b/make.sh index 6d66d63..8f8d703 100755 --- a/make.sh +++ b/make.sh @@ -105,15 +105,15 @@ time sh make-target-contrib.sh || exit 1 # Sometimes people used to see the "No tests failed." output from the last # DEFTEST in contrib self-tests and think that's all that is. So... -FLAG=true +HEADER_HAS_BEEN_PRINTED=false for dir in contrib/* do - if [ -d "$dir" -a -e "$dir/Makefile" -a ! -e "$dir/test-passed" ]; then - if $FLAG; then + if [ -d "$dir" -a -f "$dir/Makefile" -a ! -f "$dir/test-passed" ]; then + if $HEADER_HAS_BEEN_PRINTED; then echo > /dev/null else echo "Failed contribs:" - FLAG=false + HEADER_HAS_BEEN_PRINTED=true fi echo " `basename $dir`" fi diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile index c3e0a8f..bc0ef3a 100644 --- a/src/runtime/GNUmakefile +++ b/src/runtime/GNUmakefile @@ -52,7 +52,7 @@ sbcl: ${OBJS} $(CC) ${LINKFLAGS} ${OS_LINK_FLAGS} -o $@ ${OBJS} ${OS_OBJS} ${OS_LIBS} -lm -.PHONY: clean all +.PHONY: clean clean: -rm -f depend *.o sbcl sbcl.nm core *.tmp $(CLEAN_FILES) diff --git a/version.lisp-expr b/version.lisp-expr index d9b0146..f5a3c4f 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.1.1" +"0.9.1.2" -- 1.7.10.4