rpms/sbcl/FC-4 sbcl-0.9.14-LIB_DIR.patch, NONE, 1.1 sbcl.spec, 1.39, 1.40

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12712/FC-4

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.14-LIB_DIR.patch 
Log Message:
missed new patch, respin


sbcl-0.9.14-LIB_DIR.patch:

--- NEW FILE sbcl-0.9.14-LIB_DIR.patch ---
--- sbcl-0.9.14/install.sh.LIB_DIR	2006-06-12 13:18:21.000000000 -0500
+++ sbcl-0.9.14/install.sh	2006-06-26 14:34:15.000000000 -0500
@@ -23,9 +23,10 @@
 MAN_DIR=${MAN_DIR-$INSTALL_ROOT/share/man}
 INFO_DIR=${INFO_DIR-$INSTALL_ROOT/share/info}
 DOC_DIR=${DOC_DIR-$INSTALL_ROOT/share/doc/sbcl}
+LIB_DIR=${LIB_DIR-$INSTALL_ROOT/lib}
 
 # Does the environment look sane?
-if [ -n "$SBCL_HOME" -a "$INSTALL_ROOT/lib/sbcl" != "$SBCL_HOME" ];then
+if [ -n "$SBCL_HOME" -a "$LIB_DIR/sbcl" != "$SBCL_HOME" ];then
    echo SBCL_HOME environment variable is set, and conflicts with INSTALL_ROOT.
    echo Aborting installation.  Unset one or reset the other, then try again
    echo INSTALL_ROOT="$INSTALL_ROOT"
@@ -46,10 +47,10 @@
     exit 1
 fi
 
-SBCL_HOME=$INSTALL_ROOT/lib/sbcl
+SBCL_HOME=$LIB_DIR/sbcl
 export SBCL_HOME INSTALL_ROOT
 ensure_dirs $BUILD_ROOT$INSTALL_ROOT $BUILD_ROOT$INSTALL_ROOT/bin \
-    $BUILD_ROOT$INSTALL_ROOT/lib  \
+    $BUILD_ROOT$LIB_DIR  \
     $BUILD_ROOT$MAN_DIR $BUILD_ROOT$MAN_DIR/man1 \
     $BUILD_ROOT$INFO_DIR $BUILD_ROOT$DOC_DIR \
     $BUILD_ROOT$DOC_DIR/html \
@@ -89,7 +90,7 @@
 echo
 echo "SBCL has been installed:"
 echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/$RUNTIME"
-echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/"
+echo " core and contribs in $BUILD_ROOT$LIB_DIR/sbcl" 
 
 # Installing manual & misc bits of documentation
 #


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sbcl.spec	27 Jun 2006 11:51:58 -0000	1.39
+++ sbcl.spec	27 Jun 2006 12:48:31 -0000	1.40
@@ -10,7 +10,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.14
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages