mkpk

чување 35fba06013098875284a448f57f5b8aee83677ed
родитељ 0fca00e15f3fc9ce80e1f0c2e06926aa7e2fe043
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 15 Sep 2022 19:41:44 +0200

Merge branch 'master' of git.sr.ht:~strahinja/mkpk

Diffstat:
M
lib/defaults.mk
 | 
10
+++++-----
M
lib/package.mk
 | 
8
++++++++
M
lib/update.mk
 | 
2
+-

измењених датотека: 3, додавања: 14(+), брисања: 6(-)
diff --git a/lib/defaults.mk b/lib/defaults.mk
@@ -27,21 +27,21 @@ LDFLAGS=	`{ if [ -n "$LDFLAGS" ]; then echo $LDFLAGS; \
 BC=	   `{ if [ -n "$BC" ];        then echo $BC; \
 	      else echo /plan9/bin/bc; fi }
 CC=	   `{ if [ -n "$CC" ];        then echo $CC; \
-	      else echo /sucks/bin/cc; fi }
+	      else echo /bin/cc; fi }
 CURL=	   `{ if [ -n "$CURL" ];      then echo $CURL; \
-	      else echo /sucks/bin/curl; fi }
+	      else echo /bin/curl; fi }
 DATE=	   `{ if [ -n "$DATE" ];      then echo $DATE; else echo /bin/date; fi }
 GIT=	   `{ if [ -n "$GIT" ];       then echo $GIT; \
-	      else echo /sucks/bin/git; fi }
+	      else echo /bin/git; fi }
 GZ=	   `{ if [ -n "$GZ" ];        then echo $GZ; else echo /bin/gzip; fi }
 INSTALL=   `{ if [ -n "$INSTALL" ];   then echo $INSTALL; \
 	      else echo /bin/install; fi }
 LD=	   `{ if [ -n "$LD" ];        then echo $LD; \
-	      else echo /sucks/bin/cc; fi }
+	      else echo /bin/cc; fi }
 MK=	   `{ if [ -n "$MK" ];        then echo $MK; \
 	      else echo /plan9/bin/mk; fi }
 PROOT=	   `{ if [ -n "$PROOT" ];     then echo $PROOT; \
-	      else echo /sucks/bin/proot; fi }
+	      else echo /bin/proot; fi }
 RECENT=	   `{ if [ -n "$RECENT" ];    then echo $RECENT; \
 	      else echo /bin/recent; fi }
 SED=	   `{ if [ -n "$SED" ];       then echo $SED; else echo /bin/sed; fi }
diff --git a/lib/package.mk b/lib/package.mk
@@ -27,6 +27,14 @@ package-install:QV: package
 	"$INSTALL" -Dm0644 $PKG.sha512 $PKGDIR/$PKG.sha512
 
 package-fetch:QV:
+	if [ ! -d "$SRCBASEDIR" ]; then
+		printf "  MKDIR\t%s\n" "$SRCBASEDIR"
+		mkdir "$SRCBASEDIR"
+	fi
+	if [ ! -d "$SRCPKGDIR" ]; then
+		printf "  MKDIR\t%s\n" "$SRCPKGDIR"
+		mkdir "$SRCPKGDIR"
+	fi
 	cd "$SRCBASEDIR"
 	sums=$SHA512SUMS
 	dirs=$SRCDIRS
diff --git a/lib/update.mk b/lib/update.mk
@@ -4,7 +4,7 @@ update-mkfiles:QV:
 	if [ ! -d "$SRCMKFILES" ]; then
 		cd "$SRCBASEDIR"
 		printf "  GIT\t%s %s\n" clone "$SRCMKFILES"
-		git clone "$MKFILESREPO"
+		git clone "$MKFILESREPO" "$SRCMKFILES"
 	else
 		cd "$SRCMKFILES"
 		printf "  GIT\t%s %s\n" pull "$SRCMKFILES"