Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 devel/python/HISTORY |    6 ------
 devel/python/INSTALL |   10 +++++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 19afc37b01818ba5a4d14d31cea349e1ffb379a5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "python: Use make install, otherwise install fails if we've 
somehow removed/broken python"
    
    This reverts commit cf6a37452ad5b3fd1efd0496e341e8aec7a7a864.
    
    Reason: see 0607ea32b92b47c7a22727ae06d7f91f5e2d6af9.

diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index de6526b..b007c46 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,9 +1,3 @@
-2020-09-03 Eric Sandall <sandalle AT sourcemage.org>
-       * INSTALL: Use make install, otherwise install fails if we've somehow 
removed/broken python
-         Without this, python -> python2 and python2 -> python ... so 
circular links, not sure how.
-         Use TRACK_INSTALL for symlink targets
-         Don't try to copy a directory if it doesn't exist.
-
 2020-04-20 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.7.18; SECURITY_PATCH++ (CVE-2019-18348)
        * INSTALL: correct path check and fix linking
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index 9d66b97..d323281 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -1,4 +1,4 @@
-make install DESTDIR="$INSTALL_ROOT" &&
+cp -dRv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
 
 if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then
   cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH"
@@ -14,14 +14,14 @@ local PYVER=`echo ${VERSION}|cut -d . -f 1,2` &&
 # symlinks, as they are not created with altinstall.
 # See https://mail.python.org/pipermail/python-dev/2011-March/108971.html
 # and the surrounding thread for fun.
-ln -sf "${TRACK_ROOT}/usr/bin/python$PYVER" "$INSTALL_ROOT/usr/bin/python" 
|| true # always fails?
-ln -sf "${TRACK_ROOT}/usr/bin/python$PYVER" "$INSTALL_ROOT/usr/bin/python2" 
&&
-ln -sf "${TRACK_ROOT}/usr/bin/python$PYVER-config" 
"$INSTALL_ROOT/usr/bin/python2-config" &&
+ln -sf python$PYVER "$INSTALL_ROOT/usr/bin/python"
+ln -sf python$PYVER "$INSTALL_ROOT/usr/bin/python2" &&
+ln -sf python$PYVER-config "$INSTALL_ROOT/usr/bin/python2-config" &&
 
 if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
    cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
    "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
-elif [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" ] ; then
+else
    cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
    "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
 fi