From dec1b4a12d2667aec43c78d0677117c43c7a1e68 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 9 Apr 2016 03:11:52 +0000 Subject: [PATCH] scstadmin: Leave out "r" from RPM revision number git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6857 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scstadmin/Makefile b/scstadmin/Makefile index 0cb1cf85c..79bfbf168 100644 --- a/scstadmin/Makefile +++ b/scstadmin/Makefile @@ -3,9 +3,9 @@ ifndef PREFIX endif REVISION ?= $(shell if svn info >/dev/null 2>&1; \ - then svn info | sed -n 's/^Revision:[[:blank:]]*/r/p';\ - else echo -n r; git log | grep -c ^commit; \ - fi) + then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\ + else git log | grep -c ^commit; \ + fi) VERSION = $(shell echo -n "$$(sed -n 's/^[[:blank:]]*\$$VERSION[[:blank:]]*=[[:blank:]]*[\"'"'"']\([0-9.]*\)[\"'"'"'];$$/\1/p' scstadmin/scst-*/lib/SCST/SCST.pm).$(REVISION)") SCSTADMIN_DIR = $(shell if [ ! -h scstadmin ]; then \