From: Wolfgang Bumiller Date: Mon, 9 Sep 2013 10:18:30 +0000 (+0200) Subject: distro/archbsd/this - as we don't depend on glibc there, just libc; also changed... X-Git-Tag: 0.3.5~99^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=ce07e8fe28458c0c4457da90b2ff662536014033 distro/archbsd/this - as we don't depend on glibc there, just libc; also changed DESTDIR in archlinux/this/Makefile so it can be easily changed from the bsd Makefile --- diff --git a/distro/archbsd/this/Makefile b/distro/archbsd/this/Makefile new file mode 100644 index 0000000..afe5514 --- /dev/null +++ b/distro/archbsd/this/Makefile @@ -0,0 +1,4 @@ +all: + $(MAKE) -f ../../archlinux/this/Makefile \ + LIBC_DEPEND=libc \ + DESTDIR=distro/archbsd/this diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile index 22fb6c3..6efdc00 100644 --- a/distro/archlinux/this/Makefile +++ b/distro/archlinux/this/Makefile @@ -9,9 +9,10 @@ CARCH := $(shell uname -m) PKGDIR := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)-$(CARCH) 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 +22,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)" install @echo "pkgname = gmqcc" > $(PKGINFO) @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO) @echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO) @@ -32,7 +33,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)