Scripts: Use @PACKAGE_VERSION@ instead of @VERSION@.

PACKAGE_VERSION was already used in liblzma.pc.in.
This way only one version @foo@ is used.

diff --git a/src/scripts/xzdiff.in b/src/scripts/xzdiff.in
index ee5726e8143bd638fa1efeec033db0fb84cee67f..179218d91f076c811a81a8c34955b40a0fe88730 100644 (file)
--- a/src/scripts/xzdiff.in
+++ b/src/scripts/xzdiff.in
@@ -31,7 +31,7 @@ case ${0##*/} in
   *)     prog=xzdiff; cmp=${DIFF:-diff};;
 esac
 
-version="$prog (@PACKAGE_NAME@) @VERSION@"
+version="$prog (@PACKAGE_NAME@) @PACKAGE_VERSION@"
 
 usage="Usage: ${0##*/} [OPTION]... FILE1 [FILE2]
 Compare FILE1 to FILE2, using their uncompressed contents if they are

diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
index 74add3e02f43859a3f9b558ceae5d904009ce594..dad51ca4c38cc1101d7274f6d29802ba5e6d8105 100644 (file)
--- a/src/scripts/xzgrep.in
+++ b/src/scripts/xzgrep.in
@@ -35,7 +35,7 @@ case ${0##*/} in
   *)       prog=xzgrep; grep=${GREP:-grep};;
 esac
 
-version="$prog (@PACKAGE_NAME@) @VERSION@"
+version="$prog (@PACKAGE_NAME@) @PACKAGE_VERSION@"
 
 usage="Usage: ${0##*/} [OPTION]... [-e] PATTERN [FILE]...
 Look for instances of PATTERN in the input FILEs, using their

diff --git a/src/scripts/xzless.in b/src/scripts/xzless.in
index 08a64dc76fd2c54f0d0a5411bd9a9f76425a9f0e..6346966bf8e28b1f7f4eb08bc775321cdd6d2a3b 100644 (file)
--- a/src/scripts/xzless.in
+++ b/src/scripts/xzless.in
@@ -24,7 +24,7 @@
 # specified via XZ_OPT.
 xz='@xz@ --format=auto'
 
-version='xzless (@PACKAGE_NAME@) @VERSION@'
+version='xzless (@PACKAGE_NAME@) @PACKAGE_VERSION@'
 
 usage="Usage: ${0##*/} [OPTION]... [FILE]...
 Like 'less', but operate on the uncompressed contents of xz compressed FILEs.

diff --git a/src/scripts/xzmore.in b/src/scripts/xzmore.in
index 7cb31cbe2840abcfb94e3397d92b5d21bf66ee73..c571913fc36ca8310a23e94cdfb7b8ce5fc36f82 100644 (file)
--- a/src/scripts/xzmore.in
+++ b/src/scripts/xzmore.in
@@ -24,7 +24,7 @@
 # specified via XZ_OPT.
 xz='@xz@ --format=auto'
 
-version='xzmore (@PACKAGE_NAME@) @VERSION@'
+version='xzmore (@PACKAGE_NAME@) @PACKAGE_VERSION@'
 
 usage="Usage: ${0##*/} [OPTION]... [FILE]...
 Like 'more', but operate on the uncompressed contents of xz compressed FILEs.