# HG changeset patch
# User Mike Hansen
# Date 1345503767 36000
# Node ID 5f092bd491c12109b53491f000160682ea832218
# Parent 90a5f6eb6ed4c5ab5bf66851818feb6d76c5692d
#12659: build the sage library in place
diff --git a/sage-build b/sage-build
--- a/sage-build
+++ b/sage-build
@@ -14,6 +14,12 @@
echo "----------------------------------------------------------"
echo "sage: Building and installing modified Sage library files."
echo ""
+
+ # Remove this link. It will be recreated automatically; removing
+ # it now allows for the transition to build Sage in place (trac
+ # #12659), because it will replace a link to
+ # devel/sage/build/sage with a link to devel/sage/sage.
+ rm -f "$SAGE_LOCAL/lib/python/site-packages/sage"
# install c_lib
# we're doing this here instead of setup.py for historical
diff --git a/sage-sdist b/sage-sdist
--- a/sage-sdist
+++ b/sage-sdist
@@ -53,7 +53,7 @@
echo '"""nodoctests"""' > version.py
echo "version='"$SAGE_VERSION"'; date='"$SAGE_RELEASE_DATE"'" >> version.py
cd "$SAGE_ROOT"/devel/sage
- python setup.py install
+ sage -b
fi
cd "$SAGE_ROOT"/local/bin/