From f58ca083397114991939c2db495ce6bfab99c42a Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 9 Jul 2011 16:46:23 +0200 Subject: harden version generation If you run make dist, extract that tarball somewhere else and try to run makepkg it will fail because it can't find the git tree anymore. Signed-off-by: Florian Pritz --- Makefile | 7 +++++-- PKGBUILD | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 18df47f..a4bc024 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Makefile for mkinitcpio -VERSION = $(shell if test -f VERSION; then cat VERSION; else git describe; fi) +VERSION = $(shell if test -f VERSION; then cat VERSION; else git describe --dirty | sed 's/-/./g'; fi) DIRS = \ /bin \ @@ -68,4 +68,7 @@ dist: clean doc ${RM} -r mkinitcpio-${VERSION} gzip -9 mkinitcpio-${VERSION}.tar -.PHONY: clean dist install tarball +version: + @echo ${VERSION} + +.PHONY: clean dist install tarball version diff --git a/PKGBUILD b/PKGBUILD index 2cb6a6d..b5a3217 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,5 @@ -IFS='-' read -r major minor _ < <(git describe) - pkgname=mkinitcpio-git -pkgver=$major.$minor +pkgver=$(make version) pkgrel=1 pkgdesc="Modular initramfs image creation utility" arch=(any) -- cgit v1.2.3-24-g4f1b