X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=b41942843989a75ec2ff0cadd9692979ddd8d890;hb=c6ca9573e07d6547883d37ecf86f9deaffd6bcf5;hp=8548b30986adfbe11e9b6f056324bd4d87e91a4e;hpb=119d9fae7499c4f2a20eba3753d6e76a09cc8783;p=zpackage

diff --git a/Makefile b/Makefile
index 8548b30..b419428 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlit
 
 ZPMVER:=$(shell git tag --list 'v[0-9]*' | sed -e 's/^v//' | sort -nr | head -1)
 ifeq ($(strip $(ZPMVER)),)
-	ZPMVER:=0.1
+	ZPMVER:=0.1.1
 endif
 
 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
@@ -18,7 +18,7 @@ curdir=$(shell pwd)
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 	zpm-findpkg zpm-shell zpm-soneed
 
-SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -33,12 +33,12 @@ ZPM:= ./zpm -P scripts:bin:.
 
 zpm-$(ZPMVER)-1.zpm: programs
 	rm -f $@
-	$(ZPM) newpackage -f $@ -v 0.1 zpm
-	$(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v 0.1 zpm $(PROGRAMS)
+	$(ZPM) newpackage -f $@ -v $(ZPMVER) zpm
+	$(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v $(ZPMVER) zpm $(PROGRAMS)
 
-tarball: zpm-0.1-1.tar.xz
+tarball: zpm-$(ZPMVER)-1.tar.xz
 
-zpm-0.1-1.tar.xz: programs
+zpm-$(ZPMVER)-1.tar.xz: programs
 	rm -f $@
 	tar -cJf $@ --transform='s|^|bin/|' \
 		$(PROGRAMS)
@@ -129,3 +129,8 @@ clean:
 		libelf.a libzpm.a zpm-addfile soname \
 		*.xz *.zpm \
 		local.db t/ctap/prove.o
+
+tmpinstall: package
+	rm -rf tmp
+	mkdir tmp
+	ZPMDB=tmp/db.zpm ./zpm -P. install -R tmp -f zpm-$(ZPMVER)-1.zpm -u nw -g nw