Renamed src/VERSION to src/RECOLL-VERSION.txt to avoid conflict with c++ <version>

This commit is contained in:
Jean-Francois Dockes
2021-10-07 17:12:08 +02:00
parent b5013b41e1
commit dc0e3ef04a
5 changed files with 8 additions and 7 deletions
+2 -2
View File
@@ -338,11 +338,11 @@ copypyrecoll()
# First check that the config is ok
diff -q $RCL/common/autoconfig.h $RCL/common/autoconfig-win.h || \
fatal autoconfig.h and autoconfig-win.h differ
VERSION=`cat $RCL/VERSION`
VERSION=`cat $RCL/RECOLL-VERSION.txt`
CFVERS=`grep PACKAGE_VERSION $RCL/common/autoconfig.h | \
cut -d ' ' -f 3 | sed -e 's/"//g'`
test "$VERSION" = "$CFVERS" ||
fatal Versions in VERSION and autoconfig.h differ
fatal Versions in RECOLL-VERSION.txt and autoconfig.h differ
echo Packaging version $CFVERS