X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=distro%2Farchlinux%2Fthis%2FMakefile;h=6efdc00cc33f270ade32095552fd0c3528d0efef;hp=6e7c5c1bf8efbb610903a7fc4764b6debf91934e;hb=ce07e8fe28458c0c4457da90b2ff662536014033;hpb=2e07a7b2c1a008aee24db9acc21c5b69ad4e38c8

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index 6e7c5c1..6efdc00 100644
--- a/distro/archlinux/this/Makefile
+++ b/distro/archlinux/this/Makefile
@@ -9,9 +9,20 @@ CARCH   := $(shell uname -m)
 PKGDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)-$(CARCH)
 PKG     := $(PKGDIR).pkg.tar.xz
 PKGINFO := $(PKGDIR)/.PKGINFO
+DESTDIR := distro/archlinux/this
+CFLAGS  :=
 
-base: clean
-	$(MAKE) -C $(BASEDIR) DESTDIR=distro/arch/this/$(PKGDIR) PREFIX=$(PREFIX) CFLAGS+=-m64 install
+LIBC_DEPEND := glibc
+
+ifneq (, $(findstring i686, $(CARCH)))
+	CFLAGS += -m32
+	LDFLAGS += -m32
+endif
+
+base:
+	$(MAKE) -C $(BASEDIR) clean
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	  $(MAKE) -C $(BASEDIR) "DESTDIR=$(DESTDIR)/$(PKGDIR)" "PREFIX=$(PREFIX)" install
 	@echo "pkgname = gmqcc" > $(PKGINFO)
 	@echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO)
 	@echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO)
@@ -22,7 +33,7 @@ base: clean
 	@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)
@@ -30,11 +41,15 @@ base: clean
 	@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:
-	@rm -f  $(PKG)
-
+	$(MAKE) -C $(BASEDIR) clean
+	@rm -f *.pkg.tar.xz
 
 all: base