X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=6c68f2de4ca99f1703507ce065080d6cb66e0493;hb=780862a6ece30840523d91328f1945cf3edf2cfe;hp=958f08da166fe0c4006d9331abb26778ae70fd10;hpb=6fe55c25a23b7ee2e84e3ad2d508196f3e5f82a3;p=pkgutils-cross.git

diff --git a/Makefile b/Makefile
index 958f08d..6c68f2d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,17 +25,20 @@ BINDIR = /usr/bin
 MANDIR = /usr/man
 ETCDIR = /etc
 
-VERSION = 5.30.0
+VERSION = 5.34.2
+NAME = pkgutils-$(VERSION)
 
 CXXFLAGS += -DNDEBUG
 CXXFLAGS += -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" \
 	    -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-LDFLAGS += -static -larchive -lz -lbz2
+LIBARCHIVELIBS := $(shell pkg-config --libs --static libarchive)
+
+LDFLAGS += -static $(LIBARCHIVELIBS)
 
 OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o
 
-MANPAGES = pkgadd.8 pkgrm.8 pkginfo.8 pkgmk.8 rejmerge.8
+MANPAGES = pkgadd.8 pkgrm.8 pkginfo.8 pkgmk.8 rejmerge.8 pkgmk.conf.5
 
 all: pkgadd pkgmk rejmerge man
 
@@ -66,12 +69,11 @@ endif
 .PHONY:	install clean distclean dist
 
 dist: distclean
-	rm -rf /tmp/pkgutils-$(VERSION)
-	mkdir -p /tmp/pkgutils-$(VERSION)
-	git-log > ChangeLog
-	cp -rf . /tmp/pkgutils-$(VERSION)
-	tar -C /tmp --exclude .git -czvf ../pkgutils-$(VERSION).tar.gz pkgutils-$(VERSION)
-	rm -rf /tmp/pkgutils-$(VERSION)
+	rm -rf $(NAME) $(NAME).tar.gz
+	git archive --format=tar --prefix=$(NAME)/ HEAD | tar -x
+	git log > $(NAME)/ChangeLog
+	tar czvf $(NAME).tar.gz $(NAME)
+	rm -rf $(NAME)
 
 install: all
 	install -D -m0755 pkgadd $(DESTDIR)$(BINDIR)/pkgadd
@@ -85,6 +87,7 @@ install: all
 	install -D -m0644 pkginfo.8 $(DESTDIR)$(MANDIR)/man8/pkginfo.8
 	install -D -m0644 pkgmk.8 $(DESTDIR)$(MANDIR)/man8/pkgmk.8
 	install -D -m0644 rejmerge.8 $(DESTDIR)$(MANDIR)/man8/rejmerge.8
+	install -D -m0644 pkgmk.conf.5 $(DESTDIR)$(MANDIR)/man5/pkgmk.conf.5
 	ln -sf pkgadd $(DESTDIR)$(BINDIR)/pkgrm
 	ln -sf pkgadd $(DESTDIR)$(BINDIR)/pkginfo