0.9.1.2:
authorChristophe Rhodes <csr21@cam.ac.uk>
Sat, 28 May 2005 09:00:34 +0000 (09:00 +0000)
committerChristophe Rhodes <csr21@cam.ac.uk>
Sat, 28 May 2005 09:00:34 +0000 (09:00 +0000)
Merge a couple of cleanup fixes that I've had tagged for months
if not years.

install.sh
make.sh
src/runtime/GNUmakefile
version.lisp-expr

index d1a19c5..8773aa0 100644 (file)
@@ -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 (executable)
--- 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
index c3e0a8f..bc0ef3a 100644 (file)
@@ -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)
 
index d9b0146..f5a3c4f 100644 (file)
@@ -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"