When auto-versioning, use last piece of branch
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 02:20:20 +0000 (22:20 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 25 May 2011 02:48:09 +0000 (22:48 -0400)
Specifically, last / delimited piece.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Open-ILS/xul/staff_client/Makefile.am

index d210ef2..318329d 100644 (file)
@@ -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