rpms/sbcl/devel sbcl-0.9.4-LIB_DIR.patch, NONE, 1.1 sbcl.spec, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5425

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.4-LIB_DIR.patch 
Log Message:
forgot LIB_DIR patch


sbcl-0.9.4-LIB_DIR.patch:

--- NEW FILE sbcl-0.9.4-LIB_DIR.patch ---
--- sbcl-0.9.4/install.sh.lib64	2005-05-28 04:00:34.000000000 -0500
+++ sbcl-0.9.4/install.sh	2005-09-12 14:00:27.310267719 -0500
@@ -13,10 +13,11 @@
 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?
 SBCL_SOURCE=`pwd`
-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"
@@ -37,10 +38,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 \
@@ -76,7 +77,7 @@
 echo
 echo "SBCL has been installed:"
 echo " binary $BUILD_ROOT$INSTALL_ROOT/bin/sbcl"
-echo " core and contribs in $BUILD_ROOT$INSTALL_ROOT/lib/sbcl/"
+echo " core and contribs in $BUILD_ROOT$LIB_DIR"
 
 # Installing manual & misc bits of documentation
 #


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sbcl.spec	12 Sep 2005 19:16:51 -0000	1.5
+++ sbcl.spec	12 Sep 2005 19:18:18 -0000	1.6
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -181,7 +181,7 @@
 
 
 %changelog
-* Mon Sep 13 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-8
+* Mon Sep 13 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-9
 - use/define LIB_DIR instead of hard-coded INSTALL_ROOT/lib
 
 * Mon Sep 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-7