From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Fri, 26 Apr 2013 15:56:08 +0000 (+0200)
Subject: fix distro/ Makefiles
X-Git-Tag: 0.2.9~1
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=75ceab8f51954450e6228d9d640969b8f5c387b8;hp=5007fd7f7150addee29bfc5077fc8b25c1288d59

fix distro/ Makefiles
---

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index bf5a3e8..fa863d1 100644
--- 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)