aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/m4
diff options
context:
space:
mode:
authorDavid M. Syzdek <david@syzdek.net>2021-05-06 15:57:58 -0800
committerDavid M. Syzdek <david@syzdek.net>2021-05-06 15:57:58 -0800
commit74b44084f84e8dc2f957c9248af57ee23102123e (patch)
tree90173b6bdb162edf3aab6de88b1d73b282db8afc /m4
parentc587c96226e33ae12972220744792600914135f5 (diff)
downloadbindletools-74b44084f84e8dc2f957c9248af57ee23102123e.tar.gz
bindletools-74b44084f84e8dc2f957c9248af57ee23102123e.tar.bz2
bindletools-74b44084f84e8dc2f957c9248af57ee23102123e.tar.xz
bindletools-74b44084f84e8dc2f957c9248af57ee23102123e.zip
bindle-git.m4: renaming GOD to GIT_OUTPUT_DIR
Diffstat (limited to 'm4')
-rw-r--r--m4/bindle-git.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/m4/bindle-git.m4 b/m4/bindle-git.m4
index f0155e6..9a0f1e7 100644
--- a/m4/bindle-git.m4
+++ b/m4/bindle-git.m4
@@ -47,7 +47,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl
47 GIT_CACHE_FILE="" # Cached git file. 47 GIT_CACHE_FILE="" # Cached git file.
48 GIT_TARBALL_VERSION="" # Git Tarball Version (x.x.0 or x.x.x.gbbbbb). 48 GIT_TARBALL_VERSION="" # Git Tarball Version (x.x.0 or x.x.x.gbbbbb).
49 GIT_PACKAGE_NAME="" # git package name. 49 GIT_PACKAGE_NAME="" # git package name.
50 GOD="" # git out directory 50 GIT_OUTPUT_DIR="" # git out directory
51 51
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
@@ -64,9 +64,9 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl
64 # git output directory 64 # git output directory
65 if test "x$2" != "x";then 65 if test "x$2" != "x";then
66 if test -d "${2}";then 66 if test -d "${2}";then
67 GOD="${2}" 67 GIT_OUTPUT_DIR="${2}"
68 elif test -d "${srcdir}/${2}";then 68 elif test -d "${srcdir}/${2}";then
69 GOD="${srcdir}/${2}" 69 GIT_OUTPUT_DIR="${srcdir}/${2}"
70 fi 70 fi
71 fi 71 fi
72 72
@@ -77,14 +77,14 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl
77 77
78 # attempt to use script to determine version 78 # attempt to use script to determine version
79 if test "x${GIT_VERSION_SCRIPT}" != "x";then 79 if test "x${GIT_VERSION_SCRIPT}" != "x";then
80 GIT_PACKAGE_VERSION_BUILD=$(${GIT_VERSION_SCRIPT} "${srcdir}" "${GOD}" 2> /dev/null) 80 GIT_PACKAGE_VERSION_BUILD=$(${GIT_VERSION_SCRIPT} "${srcdir}" "${GIT_OUTPUT_DIR}" 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
84 if test "x${GIT_PACKAGE_VERSION_BUILD}" == "x";then 84 if test "x${GIT_PACKAGE_VERSION_BUILD}" == "x";then
85 # determines location of cache file 85 # determines location of cache file
86 if test "x${GOD}" != "x" && test -f "${GOD}/git-package-version.txt";then 86 if test "x${GIT_OUTPUT_DIR}" != "x" && test -f "${GIT_OUTPUT_DIR}/git-package-version.txt";then
87 GIT_CACHE_FILE="${GOD}/git-package-version.txt" 87 GIT_CACHE_FILE="${GIT_OUTPUT_DIR}/git-package-version.txt"
88 88
89 elif test -f "${srcdir}/build-aux/git-package-version.txt";then 89 elif test -f "${srcdir}/build-aux/git-package-version.txt";then
90 GIT_CACHE_FILE="${srcdir}/build-aux/git-package-version.txt" 90 GIT_CACHE_FILE="${srcdir}/build-aux/git-package-version.txt"