distro/archbsd/this - as we don't depend on glibc there, just libc; also changed...

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

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index 22fb6c3e93e945e76c5b37bece58408536879e06..6efdc00cc33f270ade32095552fd0c3528d0efef 100644 (file)
--- 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
 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  :=
 
 CFLAGS  :=
 

+LIBC_DEPEND := glibc

 
 ifneq (, $(findstring i686, $(CARCH)))
        CFLAGS += -m32
 
 ifneq (, $(findstring i686, $(CARCH)))
        CFLAGS += -m32


@@ -21,7 +22,7 @@ endif
 base:
        $(MAKE) -C $(BASEDIR) clean
        CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 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)
        @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 "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)
        @echo "makepkgopt = strip" >> $(PKGINFO)
        @echo "makepkgopt = docs" >> $(PKGINFO)
        @echo "makepkgopt = libtool" >> $(PKGINFO)