From 044f1f18ca74bf400646f106ee065c663654e697 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Tue, 24 May 2011 22:20:20 -0400 Subject: [PATCH] When auto-versioning, use last piece of branch Specifically, last / delimited piece. Signed-off-by: Thomas Berezansky Signed-off-by: Dan Scott --- Open-ILS/xul/staff_client/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index d210ef2aae..318329dfac 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -19,7 +19,7 @@ CHROME_LOCALES = $$(ls -1 chrome/locale) SKIN_CSS = $$(ls -1 server/skin/*css | sed -e "s/.css/_custom.css/") UPDATESDIR=@localstatedir@/updates -GIT_BRANCH=$$(git rev-parse --abbrev-ref HEAD || echo master) +GIT_BRANCH=$$(echo $$(git rev-parse --abbrev-ref HEAD || echo master) | sed 's|.*/||') GIT_TAG=$$(git rev-parse --short HEAD) # For auto-tagging builds export NSIS_EXTRAOPTS -- 2.11.0