[Sbcl-commits] CVS: sbcl/src/runtime GNUmakefile, 1.32, 1.33 runtime.c, 1.83, 1.84

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31571/src/runtime

Modified Files:
	GNUmakefile runtime.c 
Log Message:
1.0.41.45: make.sh command-line parsing

 Based on patches by Daniel Herring:

 * Simple --option and --option=arg command-line parser in make.sh.

 * Supported options:

   ** --xc-host=<command> to specify XC host option instead of a
      positional argument. (Incompatible change!)

   ** --prefix=<path> to specify a non-standard install location for
      both build and install.sh.

      Addresses https://bugs.launchpad.net/sbcl/+bug/550889

   ** --help

 Semi-related minor cleanup:

 * Use --no-userinit and --no-sysinit instead of version.lisp-expr as
   the default inits for self-building: they have been around long
   enough now that it should not stop anyone from building, and makes
   for a somewhat less magical looking "//Build options: ..." line in
   the build log.


Index: GNUmakefile
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/GNUmakefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- GNUmakefile	19 Feb 2008 10:18:07 -0000	1.32
+++ GNUmakefile	15 Aug 2010 13:59:01 -0000	1.33
@@ -23,9 +23,11 @@
 DEPEND_FLAGS = -MM
 GREP = grep
 
+include ../../output/prefix.def
+
 CFLAGS = -g -Wall -Wsign-compare -O3
 ASFLAGS = $(CFLAGS)
-CPPFLAGS = -I.
+CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
 
 # Give make access to the target Lisp features.
 include genesis/Makefile.features

Index: runtime.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/runtime.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- runtime.c	30 Apr 2010 10:56:42 -0000	1.83
+++ runtime.c	15 Aug 2010 13:59:01 -0000	1.84
@@ -67,7 +67,7 @@
 #endif
 
 #ifndef SBCL_HOME
-#define SBCL_HOME "/usr/local/lib/sbcl/"
+#define SBCL_HOME SBCL_PREFIX"/lib/sbcl/"
 #endif
 
 #ifdef LISP_FEATURE_HPUX