Use version.txt instead of version.sh

diff --git a/configure.ac b/configure.ac
index 68a02c97a5068650e8865d9aee394f784f8877f3..d044c7a344431e5645d00d25d496c07dcb0cc090 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]),
+AC_INIT([XZ Utils], m4_esyscmd([tr -d '\r\n' < build-aux/version.txt]),
        [xz@tukaani.org], [xz], [https://tukaani.org/xz/])
 AC_CONFIG_SRCDIR([src/liblzma/common/common.h])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/doxygen/update-doxygen b/doxygen/update-doxygen
index 87dfffb29e751335812715a169a826380105f704..5fea78af3e538633ca79bf115cf4eee9529dbfee 100755 (executable)
--- a/doxygen/update-doxygen
+++ b/doxygen/update-doxygen
@@ -38,7 +38,7 @@ if test ! -f Doxyfile; then
 fi
 
 # Get the package version so that it can be included in the generated docs.
-PACKAGE_VERSION=`cd .. && sh build-aux/version.sh` || exit 1
+PACKAGE_VERSION=`cat ../build-aux/version.txt` || exit 1
 
 # If no arguments are specified, default to generating liblzma API header
 # documentation only.

diff --git a/po4a/update-po b/po4a/update-po
index d886ad0d48d2a727d2d61a2057ffd53196fa9d0b..0a292cdbfa8ed0b09da69bd2bb52049b56ae9c24 100755 (executable)
--- a/po4a/update-po
+++ b/po4a/update-po
@@ -29,7 +29,7 @@ if test ! -f po4a.conf; then
        fi
 fi
 
-PACKAGE_VERSION=`cd .. && sh build-aux/version.sh` || exit 1
+PACKAGE_VERSION=`cat ../build-aux/version.txt` || exit 1
 
 # Put the author info from the .po files into the header comment of
 # the generated man pages.

diff --git a/src/liblzma/validate_map.sh b/src/liblzma/validate_map.sh
index dd1589d236e79776e0aab4b239b29fe88e7a187d..528060c7fef68f524dff3cf8ca6ab0a9824569c5 100644 (file)
--- a/src/liblzma/validate_map.sh
+++ b/src/liblzma/validate_map.sh
@@ -95,7 +95,7 @@ SYMS=$(sed -n 's/^extern LZMA_API([^)]*) \([a-z0-9_]*\)(.*$/\1;/p' \
        | grep -Fve "$(sed '/[{}:*]/d;/^$/d;s/^ //' liblzma_generic.map)")
 
 # Check that there are no old alpha or beta versions listed.
-VER=$(cd ../.. && sh build-aux/version.sh)
+VER=$(cat ../../build-aux/version.txt)
 NAMES=
 case $VER in
        *alpha | *beta)

diff --git a/windows/build.bash b/windows/build.bash
index fa7b938c3eac8e2a15f84143612e4b813b9d90ed..bf4d899250fbc2b9dbd96ecbb1c9c401db92c00b 100644 (file)
--- a/windows/build.bash
+++ b/windows/build.bash
@@ -221,7 +221,7 @@ do
 done
 
 if [ -x "$SEVENZ" ]; then
-       VER=$(sh build-aux/version.sh)
+       VER=$(cat build-aux/version.txt)
        cd pkg
        "$SEVENZ" a -tzip ../xz-$VER-windows.zip *
        "$SEVENZ" a ../xz-$VER-windows.7z *