From 3e1c10628cee6c93e14c05f464f6cbc079f07d33 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Sun, 27 Jan 2013 10:31:27 +0100 Subject: [PATCH] adding pkgrel to arch/this, and getting rid of du's -b option since it won't work for ArchBSD --- distro/arch/this/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/distro/arch/this/Makefile b/distro/arch/this/Makefile index 794d254..6e7c5c1 100644 --- a/distro/arch/this/Makefile +++ b/distro/arch/this/Makefile @@ -1,23 +1,25 @@ BASEDIR := ../../../ PREFIX := /usr HEADER := $(BASEDIR)/gmqcc.h -MAJOR := `sed -n -e '/GMQCC_VERSION_MAJOR/{s/.* .* //;p;q;}' $(HEADER)` -MINOR := `sed -n -e '/GMQCC_VERSION_MINOR/{s/.* .* //;p;q;}' $(HEADER)` -PATCH := `sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER)` -PKGDIR := gmqcc-$(MAJOR).$(MINOR).$(PATCH) -PKG := $(PKGDIR).tar.xz +MAJOR := $(shell sed -n -e '/GMQCC_VERSION_MAJOR/{s/.* .* //;p;q;}' $(HEADER)) +MINOR := $(shell sed -n -e '/GMQCC_VERSION_MINOR/{s/.* .* //;p;q;}' $(HEADER)) +PATCH := $(shell sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER)) +PKGREL := 1 +CARCH := $(shell uname -m) +PKGDIR := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)-$(CARCH) +PKG := $(PKGDIR).pkg.tar.xz PKGINFO := $(PKGDIR)/.PKGINFO -base: +base: clean $(MAKE) -C $(BASEDIR) DESTDIR=distro/arch/this/$(PKGDIR) PREFIX=$(PREFIX) CFLAGS+=-m64 install @echo "pkgname = gmqcc" > $(PKGINFO) - @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)" >> $(PKGINFO) + @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO) @echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO) @echo "url = https://github.com/graphitemaster/gmqcc.git" >> $(PKGINFO) @echo "builddate = `date -u \"+%s\"`" >> $(PKGINFO) @echo "packager = Unknown Packager" >> $(PKGINFO) - @echo "size = `du -shb $(shell echo $(PKGDIR)) | awk \"{s+=\\$$1} END {print s}\"`" >> $(PKGINFO) - @echo "arch = x86_64" >> $(PKGINFO) + @echo "size = `du -sk $(PKGDIR) | awk '{print $$1 * 1024}'`" >> $(PKGINFO) + @echo "arch = $(CARCH)" >> $(PKGINFO) @echo "license = MIT" >> $(PKGINFO) @echo "conflict = gmqcc" >> $(PKGINFO) @echo "depend = glibc" >> $(PKGINFO) -- 2.39.2