mkpk

чување 2d6bdbde86950f00e5db88a6c4c47568d2fd7252
родитељ 943b55776f881b223f4dd81198402e18bb8a3b75
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sat, 29 Apr 2023 03:15:55 +0200

Fix mkpk upgrade mkpk

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
lib/vars.mk
 | 
2
++
M
mkpk
 | 
4
++--

измењених датотека: 2, додавања: 4(+), брисања: 2(-)
diff --git a/lib/vars.mk b/lib/vars.mk
@@ -1,6 +1,8 @@
 <$mkpklib/defaults.mk
 
 output:QV:
+	printf "%s=\"%s\"\n" PKGBASE    "$PKGBASE"
+	printf "%s=\"%s\"\n" PKGVER     "$PKGVER"
 	printf "%s=\"%s\"\n" DOCDIR     "$DOCDIR"
 	printf "%s=\"%s\"\n" LEGALDIR   "$LEGALDIR"
 	printf "%s=\"%s\"\n" PKGDIR     "$PKGDIR"
diff --git a/mkpk b/mkpk
@@ -55,8 +55,8 @@ for file in $files
 do
 	if [ "${package}" = "mkpk" ] && [ "${file}" = "uninstall" ]; then
 		eval $("${MK}" -f "${mkpklib}"/vars.mk mkpklib="${mkpklib}")
-		mkpklib=${SRCBASEDIR}/mkpk/lib
-		RECENT=${SRCBASEDIR}/mkpk/recent
+		mkpklib=${SRCBASEDIR}/mkpk-${PKGVER}/lib
+		RECENT=${SRCBASEDIR}/mkpk-${PKGVER}/recent
 		export mkpklib RECENT
 	fi
 	"${MK}" -f "${mkpklib}"/${file}.mk mkpklib="${mkpklib}" \