X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=distro%2Farchlinux%2Fthis%2FMakefile;h=f22410369516b597669668391864175bd7690c44;hp=fa863d100aa77a62c2664189637bcbad881d1d11;hb=9e5d02dab00fde31e20efa9c3200165424375857;hpb=75ceab8f51954450e6228d9d640969b8f5c387b8

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index fa863d1..f224103 100644
--- a/distro/archlinux/this/Makefile
+++ b/distro/archlinux/this/Makefile
@@ -7,11 +7,13 @@ PATCH   := $(shell sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER))
 PKGREL  := 1
 CARCH   := $(shell uname -m)
 PKGDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)-$(CARCH)
+TARCOMP := -J
 PKG     := $(PKGDIR).pkg.tar.xz
 PKGINFO := $(PKGDIR)/.PKGINFO
-DESTDIR := distro/archlinux/this/$(PKGDIR)
+DESTDIR := distro/archlinux/this
 CFLAGS  :=
 
+LIBC_DEPEND := glibc
 
 ifneq (, $(findstring i686, $(CARCH)))
 	CFLAGS += -m32
@@ -21,7 +23,7 @@ endif
 base:
 	$(MAKE) -C $(BASEDIR) clean
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	  $(MAKE) -C $(BASEDIR) "DESTDIR=$(DESTDIR)" "PREFIX=$(PREFIX)" install
+	  $(MAKE) -C $(BASEDIR) "DESTDIR=$(DESTDIR)/$(PKGDIR)" "PREFIX=$(PREFIX)" strip install
 	@echo "pkgname = gmqcc" > $(PKGINFO)
 	@echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO)
 	@echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO)
@@ -32,7 +34,7 @@ base:
 	@echo "arch = $(CARCH)" >> $(PKGINFO)
 	@echo "license = MIT" >> $(PKGINFO)
 	@echo "conflict = gmqcc" >> $(PKGINFO)
-	@echo "depend = glibc" >> $(PKGINFO)
+	@echo "depend = $(LIBC_DEPEND)" >> $(PKGINFO)
 	@echo "makepkgopt = strip" >> $(PKGINFO)
 	@echo "makepkgopt = docs" >> $(PKGINFO)
 	@echo "makepkgopt = libtool" >> $(PKGINFO)
@@ -40,7 +42,11 @@ base:
 	@echo "makepkgopt = zipman" >> $(PKGINFO)
 	@echo "makepkgopt = purge" >> $(PKGINFO)
 	@echo "makepkgopt = !upx" >> $(PKGINFO)
-	@tar -cJvf $(PKG) -C $(PKGDIR)/ .PKGINFO usr/
+	@bsdtar -C $(PKGDIR) -czf $(PKGDIR)/.MTREE \
+	    --format=mtree \
+	    --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
+	    .PKGINFO usr/
+	@bsdtar $(TARCOMP) -cvf $(PKG) -C $(PKGDIR)/ .PKGINFO .MTREE usr/
 	@rm -rf $(PKGDIR)
 
 clean: