From 602e81b5ce50fb07fca52e826f6758ace44cdb65 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Sun, 16 Sep 2018 01:54:03 +0000 Subject: [PATCH] derive zpm package version from git tag Fix package target to use updated newpackage syntax. --- Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 51cd85a..e55a72d 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,6 @@ CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api -ZPMVER:=$(shell git tag --list 'v[0-9]*' | sed -e 's/^v//' | sort -nr | head -1) -ifeq ($(strip $(ZPMVER)),) - ZPMVER:=0.1.3 -endif +ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g') LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4 @@ -65,12 +62,12 @@ lib/liblzma.a: $(LZMAOBJ) lib/libjsw.a: $(JSWOBJ) ar rcuv $@ $? -ZPM:= ./zpm -P scripts:bin:. +ZPM:= ./zpm -P. zpm-$(ZPMVER)-1.zpm: programs rm -f $@ - $(ZPM) newpackage -f $@ -v $(ZPMVER) zpm - $(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v $(ZPMVER) zpm $(PROGRAMS) + $(ZPM) newpackage -C zpm-$(ZPMVER)-1 + $(ZPM) add -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS)) tarball: zpm-$(ZPMVER)-1.tar.xz -- 2.40.0