X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=bd733fb284c7a2fb47185449480ee5c23e510648;hb=refs%2Fheads%2F3.1;hp=5c1881c71fdecb2e4a09c5b159002a9e4b27d832;hpb=d7fbaa09361f5b98a49ff0b3b179f2da5f574561;p=pkgutils-cross.git

diff --git a/Makefile b/Makefile
index 5c1881c..bd733fb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 #  pkgutils
 #
 #  Copyright (c) 2000-2005 by Per Liden <per@fukt.bth.se>
+#  Copyright (c) 2006-2013 by CRUX team (http://crux.nu)
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -24,34 +25,24 @@ BINDIR = /usr/bin
 MANDIR = /usr/man
 ETCDIR = /etc
 
-VERSION = 5.21
-LIBTAR_VERSION = 1.2.11
+VERSION = 5.35.6
+NAME = pkgutils-$(VERSION)
 
 CXXFLAGS += -DNDEBUG
 CXXFLAGS += -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" \
-	    -Ilibtar-$(LIBTAR_VERSION)/lib -Ilibtar-$(LIBTAR_VERSION)/listhash \
 	    -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-LDFLAGS += -static -Llibtar-$(LIBTAR_VERSION)/lib -ltar -lz
+LIBARCHIVELIBS := $(shell pkg-config --libs --static libarchive)
 
-OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o
+LDFLAGS += -static $(LIBARCHIVELIBS)
 
-MANPAGES = pkgadd.8 pkgrm.8 pkginfo.8 pkgmk.8 rejmerge.8
+OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o
 
-LIBTAR = libtar-$(LIBTAR_VERSION)/lib/libtar.a
+MANPAGES = pkgadd.8 pkgrm.8 pkginfo.8 pkgmk.8 rejmerge.8 pkgmk.conf.5
 
 all: pkgadd pkgmk rejmerge man
 
-$(LIBTAR):
-	(tar xzf libtar-$(LIBTAR_VERSION).tar.gz; \
-	cd libtar-$(LIBTAR_VERSION); \
-	patch -p1 < ../libtar-$(LIBTAR_VERSION)-fix_mem_leak.patch; \
-	patch -p1 < ../libtar-$(LIBTAR_VERSION)-reduce_mem_usage.patch; \
-	patch -p1 < ../libtar-$(LIBTAR_VERSION)-fix_linkname_overflow.patch; \
-	LDFLAGS="" ./configure --disable-encap --disable-encap-install; \
-	make)
-
-pkgadd: $(LIBTAR) .depend $(OBJECTS)
+pkgadd: .depend $(OBJECTS)
 	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
 
 pkgmk: pkgmk.in
@@ -78,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
@@ -97,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
 
@@ -108,6 +99,5 @@ clean:
 
 distclean: clean
 	rm -f pkgadd pkginfo pkgrm pkgmk rejmerge
-	rm -rf libtar-$(LIBTAR_VERSION)
 
 # End of file