galeb-mkfiles

чување c50a3235126e0a432f0ed71fd02bed41d33a53d2
родитељ c5a341b6188c6d118ed87ee70e0a2b8841686713
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Fri,  5 Aug 2022 12:12:10 +0200

Fix sacc

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

Diffstat:
M
sacc/mkfile
 | 
18
+++++++-----------
M
sacc/mkpk-config.mk
 | 
2
+-

измењених датотека: 2, додавања: 8(+), брисања: 12(-)
diff --git a/sacc/mkfile b/sacc/mkfile
@@ -4,13 +4,10 @@ mkpklib=/lib/mkpk
 <mkpk-config.mk
 <$mkpklib/derivatives.mk
 
-date=		`{$DATE "$DATEARGS"}
-version=	`{$GIT describe 2>/dev/null | $SED 's,^v,,'}
-PKG=		`{ if [ -z "$version" ]; then \
-		   	echo $PKGBASE-$FALLBACKVER; \
-		   else \
-			echo $PKGBASE-$version; \
-		   fi}
+GETVER=		`{ $GIT rev-parse --is-inside-work-tree >/dev/null 2>&1 \
+			&& $GIT describe --tags || echo $DEFVERSION }
+
+PKG=		$PKGBASE-$GETVER
 OBJ=		${SRC:%.c=%.o}
 JUNK=		$BIN $OBJ $PKG.tar.xz $PKG.sha512 *~
 
@@ -20,9 +17,6 @@ install_sources=	$install_sources install-post
 <$mkpklib/c.targets.mk
 <$mkpklib/package.mk
 
-GETVER=		`{ $GIT rev-parse --is-inside-work-tree >/dev/null 2>&1 \
-			&& $GIT describe --tags || echo $DEFVERSION }
-
 config.h:Q:
 	printf "  CP\t%s %s\n" .def.h $target
 	cp config.def.h $target
@@ -35,4 +29,6 @@ install-post:Q: install-standard
 	printf "  CHMOD\t%s %s\n" 555 $BINDIR/$BIN
 	chmod 555 $BINDIR/$BIN
 	printf "  SED\t%s\n" $MANDIR/man1/$MAN1
-	$SED -e "s/%VERSION%/$GETVER/" $MANDIR/man1/$MAN1
+	mv $MANDIR/man1/$MAN1 $MANDIR/man1/$MAN1~
+	$SED -e "s/%VERSION%/$GETVER/" $MANDIR/man1/$MAN1~ > $MANDIR/man1/$MAN1
+	rm $MANDIR/man1/$MAN1~
diff --git a/sacc/mkpk-config.mk b/sacc/mkpk-config.mk
@@ -2,7 +2,7 @@ BIN=		sacc
 CFLAGS=		$CFLAGS -DUSE_TLS
 DEFVERSION=	1.06
 LDFLAGS=	$LDFLAGS -zmuldefs
-LIBS=		-lcurses -ltermcap
+LIBS=		-lcurses -ltermcap -ltls
 LEGALFILES=	LICENSE
 MAN1=		sacc.1
 ODEPS=		config.h io.h version.h