]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
debian Makefile had the same flaw as archlinux/this... fixing
authorWolfgang Bumiller <wry.git@bumiller.com>
Sat, 27 Apr 2013 15:00:27 +0000 (17:00 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Sat, 27 Apr 2013 15:00:27 +0000 (17:00 +0200)
distro/deb/Makefile

index df23602b592b94a07c7ef47d0792b030dad86e0b..7594400300c9482bab11df2ae93b5509683a4114 100644 (file)
@@ -10,12 +10,14 @@ DEB     := $(DEBDIR)-$(CARCH).deb
 CONTROL := $(DEBDIR)/DEBIAN/control
 
 ifneq (, $(findstring i686, $(CARCH)))
-       CFLAGS := -m32
+       CFLAGS += -m32
+       LDFLAGS += -m32
 endif
 
 base:
        $(MAKE) -C $(BASEDIR) clean
-       $(MAKE) -C $(BASEDIR) DESTDIR=distro/deb/$(DEBDIR) PREFIX=$(PREFIX) install
+       CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+         $(MAKE) -C $(BASEDIR) DESTDIR=distro/deb/$(DEBDIR) PREFIX=$(PREFIX) install
        @install -d -m755 $(DEBDIR)/DEBIAN
        @echo "Package: gmqcc" > $(CONTROL)
        @echo "Version: $(MAJOR).$(MINOR).$(PATCH)" >> $(CONTROL)