From: Cyrus Harmon Date: Fri, 21 Jan 2011 05:53:41 +0000 (+0000) Subject: 1.0.45.10: tools-for-build/Makefile path fixes X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2e5263a05f55e2b56a3194ad7853e9ae18ad69af;p=sbcl.git 1.0.45.10: tools-for-build/Makefile path fixes * make include rules non-breaking and use path relative to the path setup via -I (src/runtime). This should fix things such that both clean.sh and make.sh should now work. --- diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile index a2d2c1d..7a4c16f 100644 --- a/tools-for-build/Makefile +++ b/tools-for-build/Makefile @@ -7,8 +7,8 @@ # provided with absolutely no warranty. See the COPYING and CREDITS # files for more information. -include ../src/runtime/genesis/Makefile.features -include ../src/runtime/Config +-include genesis/Makefile.features +-include Config CPPFLAGS:=-I../src/runtime LDFLAGS:=$(LDFLAGS) diff --git a/version.lisp-expr b/version.lisp-expr index 7eee84e..e677ad4 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -16,8 +16,8 @@ ;;; ;;; Conventionally a string like "0.6.6", with three numeric fields, ;;; is used for released versions, and a string like "0.6.5.xyzzy", -;;; with something arbitrary in the fourth field, is used for CVS +;;; with something arbitrary in the fourth field, is used fsbcl-or CVS ;;; 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".) -"1.0.45.9" +"1.0.45.10"