X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=67854e0186401cba21b7e35da3f8dab05ef21e30;hb=0ac06dd73a92022079bbd0d4eb770d2c6202c23c;hp=2be04baf45ff9158eb1bd6910b1943d899163bea;hpb=9ed8a8ffdb3c31be8d324a9a67a84aad59922c9f;p=zpackage

diff --git a/Makefile b/Makefile
index 2be04ba..67854e0 100644
--- a/Makefile
+++ b/Makefile
@@ -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
+SCRIPTS=zpm zpm-install zpm-merge zpm-list
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -33,15 +33,14 @@ ZPM:= ./zpm -P scripts:bin:.
 
 zpm-0.1-1.zpm: programs
 	rm -f $@
-	./zpm -P scripts:bin:. newpackage -f $@ -v 0.1 zpm
-	./zpm -P scripts:bin:. addtopackage -f $@ -P /usr/libexec/zpm -v 0.1 zpm $(PROGRAMS)
+	$(ZPM) newpackage -f $@ -v 0.1 zpm
+	$(ZPM) addtopackage -u root -g root -f $@ -P /bin -v 0.1 zpm $(PROGRAMS)
 
 tarball: zpm-0.1-1.tar.xz
 
 zpm-0.1-1.tar.xz: programs
 	rm -f $@
-	tar -cJf $@ --transform='s|^|usr/libexec/zpm/|' \
-		--transform='s|^usr/libexec/zpm/zpm$$|usr/bin/zpm|' \
+	tar -cJf $@ --transform='s|^|bin/|' \
 		$(PROGRAMS)
 
 lzma.c: mklzma
@@ -57,7 +56,7 @@ test: $(ZPKGBIN)
 	PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
 
 programs: elftype zpm-soname zpm-soneed zpm-addfile zpm-extract zpm-init \
-	zpm-vercmp zpm-findpkg
+	zpm-vercmp zpm-findpkg zpm-merge
 
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -109,7 +108,7 @@ zpm-shell: sqlite/sqlite3.o sqlite/shell.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
-	sqlite/sqlite3.o \
+	sqlite/sqlite3.o lib/zpm_hash.o \
 	lib/vercmp.o \
 	lib/sha256.o \
 	$(LZMAOBJ)