dtree

чување a5c7b896770d4f0b47933d6f47cc543fd265bdf4
родитељ ea53a87540a101f362e1f89bb2c3a8db8ff9b92e
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sun,  7 Jul 2024 17:27:10 +0200

Makefile,lib/: Synchronize build files changes from sled

Diffstat:
M
Makefile
 | 
2
+-
M
lib/makeversion
 | 
4
++--
M
lib/mkpack
 | 
2
+-

измењених датотека: 3, додавања: 4(+), брисања: 4(-)
diff --git a/Makefile b/Makefile
@@ -55,7 +55,7 @@ uninstall:
 	rm -f $(PROG) $(BINDIR)/$(PROG)
 	rmdir $(BINDIR) 2>/dev/null || true
 
-pack: all
+pack:
 	sh -x lib/mkpack
 
 .PHONY: all clean install makedate makeversion pack uninstall
diff --git a/lib/makeversion b/lib/makeversion
@@ -4,13 +4,13 @@ FALLBACKVER=${FALLBACKVER:-unknown}
 
 if [ -d .got ] && command -v got >/dev/null 2>&1; then
 	lastcommit=$(got log |
-		awk '/^commit/ {print substr($2,1,9); exit}')
+		awk '/^commit/ {print substr($2,1,7); exit}')
 	got tag -l |
 		awk -v lastcommit="$lastcommit" '
 		/^object: commit/ {
 			if (!lasttagcom)
 			{
-				lasttagcom = substr($3,1,9)
+				lasttagcom = substr($3,1,7)
 			}
 			next
 		}
diff --git a/lib/mkpack b/lib/mkpack
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 # vim: set ft=bash:
-DISTDIR=$(grep ^PROG config.mk |
+DISTDIR=$(grep '^PROG[[:space:]]\{1,\}=' config.mk |
 	sed -E 's,.*=[[:space:]]+([[:alpha:]]+),\1,')-$(cat version)
 mkdir "$DISTDIR"
 if [ -d .got ] && command -v got >/dev/null 2>&1; then