X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=1a4b2b6bcc647703e862d4a6fb65ba3fbb288256;hb=534ded38135c3a3ed4729b878c7df67be767affb;hp=6e31be41cdcff0abac078f3164436f88924e203a;hpb=e6c399c85c0dfe21e6d31885408a1a14488ed417;p=zpackage

diff --git a/Makefile b/Makefile
index 6e31be4..1a4b2b6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
 	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
-	zpm-pkg zpm-add zpm-pkgfile zpm-gc
+	zpm-pkg zpm-add zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -72,16 +72,17 @@ lib/libjsw.a: $(JSWOBJ)
 
 ZPM:= ./zpm -P.
 
-zpm-$(ZPMVER)-1.zpm: programs
+zpm-$(ZPMVER)-1.zpm: programs doc/zpm.8
 	rm -f $@
 	$(ZPM) newpackage -C zpm-$(ZPMVER)-1
 	$(ZPM) add -v -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
+	$(ZPM) add -v -u root -g root -f $@ -P /usr/share/man/man8 -S doc doc/zpm.8
 
 tarball: zpm-$(ZPMVER)-1.tar.xz
 
 zpm-$(ZPMVER)-1.tar.xz: programs
 	rm -f $@
-	tar -cJf $@ --transform='s|^|bin/|' \
+	tar -cJf $@ --transform='s|^|sbin/|' \
 		$(PROGRAMS)
 
 lzma.c: mklzma
@@ -158,6 +159,11 @@ zpm-parse: zpm-parse.o lib/parse.o
 zpm-quote: zpm-quote.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
+db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql
+	echo 'begin;' > $@
+	cat $+ >> $@
+	echo 'commit;' >> $@
+
 newdb.c: db.sql
 	echo "char createdb[] = {" > $@
 	xxd -i < $< >> $@
@@ -166,9 +172,13 @@ newdb.c: db.sql
 sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
 	$(CC) -O3 -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
-sqlite/shell.o: sqlite/shell.c sqlite/config.h
+sqlite/extensions.o: sqlite/extensions.c
+	$(CC) -O3 -Wall -std=c99 -I. -DSQLITE_CORE=1 -c -o $@ $<
+
+sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
 	$(CC) -Wall -std=c99 -Ilib \
 		-DSQLITE_OMIT_LOAD_EXTENSION=1 \
+		'-DSQLITE_SHELL_INIT_PROC(x)=zpm_setup_extensions(x)' \
 		-D_POSIX_C_SOURCE=200112L -c -o $@ $<
 
 lib/zpm.o: newdb.c
@@ -176,16 +186,17 @@ lib/zpm.o: newdb.c
 zpm-vercmp: zpm-vercmp.o lib/vercmp.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
-zpm-shell: sqlite/sqlite3.o sqlite/shell.o
+zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-
 libelf.a: elf/libelf.o
 	ar rcuv $@ $?
 
-install: $(COMPILED)
-	test -d $(DESTDIR)/bin || install -d $(DESTDIR)/bin
-	install -D $(PROGRAMS) $(DESTDIR)/bin
+install: $(COMPILED) doc/zpm.8
+	test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+	install $(PROGRAMS) $(DESTDIR)/sbin
+	mkdir -p $(DESTDIR)/usr/share/man/man8
+	install -m644 doc/zpm.8 $(DESTDIR)/usr/share/man/man8
 
 scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
 	@echo scan-build -v -o report make -j10
@@ -194,4 +205,5 @@ clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \
 		*.xz \
-		local.db t/ctap/prove.o $(ZPKGBIN)
+		local.db t/ctap/prove.o $(ZPKGBIN) \
+		db.sql