myver is a bit generic for an internal variable name.
Signed-off-by: Allan McRae <[email protected]>
---
scripts/makepkg.sh.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 9baf350..93587b3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -39,7 +39,7 @@ export COMMAND_MODE='legacy'
# Ensure CDPATH doesn't screw with our cd calls
unset CDPATH
-declare -r myver='@PACKAGE_VERSION@'
+declare -r makepkg_version='@PACKAGE_VERSION@'
declare -r confdir='@sysconfdir@'
declare -r BUILDSCRIPT='@BUILDSCRIPT@'
declare -r startdir="$PWD"
@@ -1498,7 +1498,7 @@ write_pkginfo() {
size="$(( ${size%%[^0-9]*} * 1024 ))"
msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
- echo "# Generated by makepkg $myver"
+ echo "# Generated by makepkg $makepkg_version"
if (( INFAKEROOT )); then
echo "# using $(fakeroot -v)"
fi
@@ -2076,7 +2076,7 @@ canonicalize_path() {
m4_include(library/parseopts.sh)
usage() {
- printf "makepkg (pacman) %s\n" "$myver"
+ printf "makepkg (pacman) %s\n" "$makepkg_version"
echo
printf -- "$(gettext "Usage: %s [options]")\n" "$0"
echo
@@ -2121,7 +2121,7 @@ usage() {
}
version() {
- printf "makepkg (pacman) %s\n" "$myver"
+ printf "makepkg (pacman) %s\n" "$makepkg_version"
printf -- "$(gettext "\
Copyright (c) 2006-2012 Pacman Development Team <[email protected]>.\n\
Copyright (C) 2002-2006 Judd Vinet <[email protected]>.\n\n\
--
1.7.11.2
