From 9839659de3f7d8e8827af776d23efe15627c7d3e Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 21 May 2012 13:44:02 +0200 Subject: Fixes a conflict with XenStore (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668550) Signed-off-by: Martin Lucina --- version.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'version.sh') diff --git a/version.sh b/version.sh index 23c453f..569b53a 100755 --- a/version.sh +++ b/version.sh @@ -3,15 +3,15 @@ # This script extracts the Crossroads version from include/xs.h, # which is the master location for this information. # -if [ ! -f include/xs.h ]; then - echo "version.sh: error: include/xs.h does not exist" 1>&2 +if [ ! -f include/xs/xs.h ]; then + echo "version.sh: error: include/xs/xs.h does not exist" 1>&2 exit 1 fi -MAJOR=`egrep '^#define +XS_VERSION_MAJOR +[0-9]+$' include/xs.h` -MINOR=`egrep '^#define +XS_VERSION_MINOR +[0-9]+$' include/xs.h` -PATCH=`egrep '^#define +XS_VERSION_PATCH +[0-9]+$' include/xs.h` +MAJOR=`egrep '^#define +XS_VERSION_MAJOR +[0-9]+$' include/xs/xs.h` +MINOR=`egrep '^#define +XS_VERSION_MINOR +[0-9]+$' include/xs/xs.h` +PATCH=`egrep '^#define +XS_VERSION_PATCH +[0-9]+$' include/xs/xs.h` if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then - echo "version.sh: error: could not extract version from include/xs.h" 1>&2 + echo "version.sh: error: could not extract version from include/xs/xs.h" 1>&2 exit 1 fi MAJOR=`echo $MAJOR | awk '{ print $3 }'` -- cgit v1.2.3