distro/archlinux/this: generate the .MTREE file

[xonotic/gmqcc.git] / distro / archlinux / this / Makefile

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index bf5a3e86e7f9ca8842ee710e6078013d159fd685..22fb6c3e93e945e76c5b37bece58408536879e06 100644 (file)
--- a/distro/archlinux/this/Makefile
+++ b/distro/archlinux/this/Makefile
@@ -14,12 +14,14 @@ CFLAGS  :=
 
 
 ifneq (, $(findstring i686, $(CARCH)))
-       CFLAGS := -m32
+       CFLAGS += -m32
+       LDFLAGS += -m32
 endif
 
 base:
        $(MAKE) -C $(BASEDIR) clean
-       $(MAKE) -C $(BASEDIR) OPTIONAL=$(CFLAGS) DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install
+       CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+         $(MAKE) -C $(BASEDIR) "DESTDIR=$(DESTDIR)" "PREFIX=$(PREFIX)" install
        @echo "pkgname = gmqcc" > $(PKGINFO)
        @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO)
        @echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO)
@@ -38,7 +40,11 @@ base:
        @echo "makepkgopt = zipman" >> $(PKGINFO)
        @echo "makepkgopt = purge" >> $(PKGINFO)
        @echo "makepkgopt = !upx" >> $(PKGINFO)
-       @tar -cJvf $(PKG) -C $(PKGDIR)/ .PKGINFO usr/
+       @tar -C $(PKGDIR) -czf $(PKGDIR)/.MTREE \
+           --format=mtree \
+           --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
+           .PKGINFO usr/
+       @tar -cJvf $(PKG) -C $(PKGDIR)/ .PKGINFO .MTREE usr/
        @rm -rf $(PKGDIR)
 
 clean: