diff options
| author | Martin Lucina <martin@lucina.net> | 2012-05-21 13:44:02 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2012-05-21 13:44:02 +0200 |
| commit | 9839659de3f7d8e8827af776d23efe15627c7d3e (patch) | |
| tree | 5c889b61984bd14f9990e34f69a7a43e01fd4024 /version.sh | |
| parent | 3f9d24d24322ed40d861c006671a386532728812 (diff) | |
Fixes a conflict with XenStore (see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668550)
Signed-off-by: Martin Lucina <martin@lucina.net>
Diffstat (limited to 'version.sh')
| -rwxr-xr-x | version.sh | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 }'` |