X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=4ad7edbce9d1bdea1119d733361c4909bdc6dc56;hb=de3ce49c093f0c274d2921fa90ad829e1fc4a5f9;hp=8113f9db5658b1b408e2f93196a159183480100e;hpb=4ab5a7522d48344dbbef464e9468436fc2ee8da1;p=zpackage

diff --git a/Makefile b/Makefile
index 8113f9d..4ad7edb 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
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -72,10 +72,11 @@ 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
 
@@ -166,9 +167,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 +181,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)
+install: $(COMPILED) doc/zpm.8
 	test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
 	install $(PROGRAMS) $(DESTDIR)/sbin
+	mkdir $(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