hg diff in spkg/base gives the diff at the bottom in a just-extracted
sage-3.1.2.alpha4. Should this repository be ignored or is this just
an oversight?
diff -r 743c463b3af6 sage-env
--- a/sage-env Sun May 18 17:08:31 2008 -0700
+++ b/sage-env Wed Sep 03 13:43:21 2008 -0400
@@ -148,8 +148,10 @@ fi
fi
LD_LIBRARY_PATH="$SAGE_ROOT/local/lib/:$LD_LIBRARY_PATH" && export
LD_LIBRARY_PATH
-# This following is needed for openmpi:
+# The following is needed for openmpi:
LD_LIBRARY_PATH="$SAGE_ROOT/local/lib/openmpi:$LD_LIBRARY_PATH" &&
export LD_LIBRARY_PATH
+# The following is needed for R (in case the Sage install is moved):
+LD_LIBRARY_PATH="$SAGE_ROOT/local/lib/R/lib:$LD_LIBRARY_PATH" &&
export LD_LIBRARY_PATH
# The following is needed for OS X (especially for the
# Singular install).
if [ `uname` = "Darwin" ]; then
@@ -162,6 +164,10 @@ fi
if [ "$1" = "-short" ]; then
exit 0
+fi
+
+if [ -z "$RHOME" ]; then
+ RHOME="$SAGE_LOCAL/lib/R" && export RHOME
fi
diff -r 743c463b3af6 sage-spkg
--- a/sage-spkg Sun May 18 17:08:31 2008 -0700
+++ b/sage-spkg Wed Sep 03 13:43:21 2008 -0400
@@ -140,7 +140,7 @@ if [ $DELETE_TMP -eq 1 ]; then
if [ $DELETE_TMP -eq 1 ]; then
echo "Deleting directories from past builds of previous/current
versions of $PKG_NAME"
# Make triply sure that we are in the build directory before doing
- # a scarry "rm -rf".
+ # a scary "rm -rf".
cd "$SAGE_PACKAGES/build"
if [ $? -ne 0 ]; then
echo "Unable to find build directory."
@@ -154,7 +154,7 @@ fi
if [ ! -f "$PKG_SRC" ]; then
- echo "$0: file $PKG_SRC does not exist"
+ echo "$0: file $PKG_NAME does not exist"
echo "Attempting to download it."
CUR=`pwd`
cd "$SAGE_PACKAGES"
@@ -162,7 +162,7 @@ if [ ! -f "$PKG_SRC" ]; then
$MKDIR optional
fi
cd optional
- sage-download_package "$PKG_NAME"
+ sage-download_package "$1"
if [ ! -f "$PKG_NAME.spkg" ]; then
echo "sage: Failed to download package $PKG_NAME from $SAGE_SERVER"
exit 1
--~--~---------~--~----~------------~-------~--~----~
To post to this group, send email to sage-devel@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/sage-devel
URLs: http://www.sagemath.org
-~----------~----~----~----~------~----~------~--~---
