diff options
| author | David M. Syzdek <david@syzdek.net> | 2021-05-06 15:50:48 -0800 |
|---|---|---|
| committer | David M. Syzdek <david@syzdek.net> | 2021-05-06 15:50:48 -0800 |
| commit | 8a9fb63a3fe790fb27ca8d91b4ec30350072cf62 (patch) | |
| tree | 32c8aac580e4bfe5a33da0908a195aaca7a330ee | |
| parent | e8503608403d47082fdb58199d86e7b1888b6849 (diff) | |
| download | bindletools-8a9fb63a3fe790fb27ca8d91b4ec30350072cf62.tar.gz bindletools-8a9fb63a3fe790fb27ca8d91b4ec30350072cf62.tar.bz2 bindletools-8a9fb63a3fe790fb27ca8d91b4ec30350072cf62.tar.xz bindletools-8a9fb63a3fe790fb27ca8d91b4ec30350072cf62.zip | |
bindle-git.m4: renaming GSH to GIT_VERSION_SCRIPT
| -rw-r--r-- | m4/bindle-git.m4 | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/m4/bindle-git.m4 b/m4/bindle-git.m4 index 561126e..420ca00 100644 --- a/m4/bindle-git.m4 +++ b/m4/bindle-git.m4 | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | 39 | AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl |
| 40 | 40 | ||
| 41 | # sets vars to known states | 41 | # sets vars to known states |
| 42 | GSH="" # Git package version script. | 42 | GIT_VERSION_SCRIPT="" # Git package version script. |
| 43 | GIT_PACKAGE_VERSION_BUILD="" # Git package version build (x.x.x.gbbbbb). | 43 | GIT_PACKAGE_VERSION_BUILD="" # Git package version build (x.x.x.gbbbbb). |
| 44 | GPV="" # Git package version (x.x.x). | 44 | GPV="" # Git package version (x.x.x). |
| 45 | GIT_PACKAGE_BUILD="" # Git package build (gbbbbb). | 45 | GIT_PACKAGE_BUILD="" # Git package build (gbbbbb). |
| @@ -52,13 +52,13 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 52 | # git package version script location | 52 | # git package version script location |
| 53 | if test "x$1" != "x";then | 53 | if test "x$1" != "x";then |
| 54 | if test -f "${srcdir}/$1";then | 54 | if test -f "${srcdir}/$1";then |
| 55 | GSH="${srcdir}/$1" | 55 | GIT_VERSION_SCRIPT="${srcdir}/$1" |
| 56 | else | 56 | else |
| 57 | AC_MSG_WARN([hard coded git package version script does not exist]) | 57 | AC_MSG_WARN([hard coded git package version script does not exist]) |
| 58 | fi | 58 | fi |
| 59 | fi | 59 | fi |
| 60 | if test "x${GSH}" == "x";then | 60 | if test "x${GIT_VERSION_SCRIPT}" == "x";then |
| 61 | GSH=${ac_aux_dir}/git-package-version.sh | 61 | GIT_VERSION_SCRIPT=${ac_aux_dir}/git-package-version.sh |
| 62 | fi | 62 | fi |
| 63 | 63 | ||
| 64 | # git output directory | 64 | # git output directory |
| @@ -71,13 +71,13 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 71 | fi | 71 | fi |
| 72 | 72 | ||
| 73 | # sets bindletools directory | 73 | # sets bindletools directory |
| 74 | BINDLEDIR=`dirname ${GSH}` | 74 | BINDLEDIR=`dirname ${GIT_VERSION_SCRIPT}` |
| 75 | BINDLEDIR=`dirname ${BINDLEDIR}` | 75 | BINDLEDIR=`dirname ${BINDLEDIR}` |
| 76 | AC_REQUIRE([AC_BINDLE]) | 76 | AC_REQUIRE([AC_BINDLE]) |
| 77 | 77 | ||
| 78 | # attempt to use script to determine version | 78 | # attempt to use script to determine version |
| 79 | if test "x${GSH}" != "x";then | 79 | if test "x${GIT_VERSION_SCRIPT}" != "x";then |
| 80 | GIT_PACKAGE_VERSION_BUILD=$(${GSH} "${srcdir}" "${GOD}" 2> /dev/null) | 80 | GIT_PACKAGE_VERSION_BUILD=$(${GIT_VERSION_SCRIPT} "${srcdir}" "${GOD}" 2> /dev/null) |
| 81 | fi | 81 | fi |
| 82 | 82 | ||
| 83 | # attempt to fall back to cache files | 83 | # attempt to fall back to cache files |
| @@ -139,7 +139,6 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 139 | AC_MSG_NOTICE([using git numeric version ${GIT_PACKAGE_VERSION_NUMBER}]) | 139 | AC_MSG_NOTICE([using git numeric version ${GIT_PACKAGE_VERSION_NUMBER}]) |
| 140 | # | 140 | # |
| 141 | # set internal variables | 141 | # set internal variables |
| 142 | GIT_VERSION_SCRIPT=${GSH} | ||
| 143 | GIT_PACKAGE_VERSION=${GPV} | 142 | GIT_PACKAGE_VERSION=${GPV} |
| 144 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} | 143 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} |
| 145 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} | 144 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} |
| @@ -173,7 +172,6 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 173 | fi | 172 | fi |
| 174 | 173 | ||
| 175 | # clears vars | 174 | # clears vars |
| 176 | unset GSH | ||
| 177 | unset GPV | 175 | unset GPV |
| 178 | unset GCS | 176 | unset GCS |
| 179 | unset GPN | 177 | unset GPN |
