From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 3 Nov 2024 09:29:33 +0000 (+0300)
Subject: Do not use SKELPKGS during build
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6496b6f12b157ef0665f187b57ee199a8006d8ba2f51f27ffd8fe29a739e8858;p=bass.git

Do not use SKELPKGS during build
---

diff --git a/build/skel/common.rc b/build/skel/common.rc
index 9035d15..19c4f19 100644
--- a/build/skel/common.rc
+++ b/build/skel/common.rc
@@ -1,6 +1,8 @@
 # Check if we are in pkg/... hierarchy
+_pkgs="$BASS_ROOT"/build/pkg
+_pkgs="$(realpath $_pkgs/$ARCH)"
 SKELSUBNAME=$(realpath $PWD)
-SKELSUBNAME="${SKELSUBNAME#*"$(realpath $SKELPKGS/$ARCH)"}"
+SKELSUBNAME="${SKELSUBNAME#*$_pkgs}"
 export SKELSUBNAME
 if [ "$SKELSUBNAME" = "$PWD" ] ; then
     cat >&2 <<EOF
@@ -13,12 +15,12 @@ SKELSUBNAME=${SKELSUBNAME#/}
 export SKELFULLNAME=$1
 [ "$SKELSUBNAME" = "" ] || SKELFULLNAME="$SKELSUBNAME/$1"
 
-cd $SKELPKGS/$ARCH
+cd $_pkgs
 [ -s $SKELFULLNAME.do ] # assert that SKELFULLNAME exists
 
 if [ -s prebuilt/$SKELFULLNAME ] ; then
     echo Using prebuilt/$SKELFULLNAME >&2
-    cd $SKELPKGS/$ARCH/$SKELSUBNAME
-    ln $SKELPKGS/$ARCH/prebuilt/$SKELFULLNAME $3
+    cd $_pkgs/$SKELSUBNAME
+    ln $_pkgs/prebuilt/$SKELFULLNAME $3
     exit 0
 fi