diff options
author | Gary V. Vaughan <gary@gnu.org> | 2014-01-27 15:04:53 +1300 |
---|---|---|
committer | Gary V. Vaughan <gary@gnu.org> | 2014-01-27 15:11:09 +1300 |
commit | 70ff0e04c9dda19b74c88005abed3c1ca4adc3fc (patch) | |
tree | fcfab9013cedc2ec8a7b2d1afce0c6ff2edc65e8 | |
parent | 525cddd2bcea4c565d6dd1d2d55dd1de1a476b67 (diff) | |
download | libtool-70ff0e04c9dda19b74c88005abed3c1ca4adc3fc.tar.gz |
bootstrap: use `-d .git` to check whether we are in a git tree.
* gl/build-aux/bootstrap.in (func_require_git): .git is not a
regular file, use -d to check its existence.
* bootstrap: Regenerate.
* THANKS: Add Bruce Korb.
Reported by Bruce Korb
Copyright-paperwork-exempt: Yes
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r-- | THANKS | 1 | ||||
-rwxr-xr-x | bootstrap | 4 | ||||
-rwxr-xr-x | gl/build-aux/bootstrap.in | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -78,6 +78,7 @@ Brad Smith brad@comstyle.com Brent Leback brent.leback@st.com Brian Barrett brbarret@osl.iu.edu + Bruce Korb bruce.korb@gmail.com Bruno Haible haible@ilog.fr Brice De Bruyne bricedb@gmail.com Camilo La Rota camilo.larota@ens-lyon.fr @@ -2563,7 +2563,7 @@ test extract-trace = "$progname" && func_main "$@" # End: # Set a version string for *this* script. -scriptversion=2014-01-04.01; # UTC +scriptversion=2014-01-27.02; # UTC ## ------------------- ## @@ -3698,7 +3698,7 @@ func_require_git () $opt_skip_git && GIT=true test true = "$GIT" || { - if test -f .git; then + if test -d .git; then ($GIT --version) >/dev/null 2>&1 || GIT=true fi } diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in index 8441bdc6..d0276f60 100755 --- a/gl/build-aux/bootstrap.in +++ b/gl/build-aux/bootstrap.in @@ -232,7 +232,7 @@ vc_ignore= . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace" # Set a version string for *this* script. -scriptversion=2014-01-04.01; # UTC +scriptversion=2014-01-27.02; # UTC ## ------------------- ## @@ -1367,7 +1367,7 @@ func_require_git () $opt_skip_git && GIT=true test true = "$GIT" || { - if test -f .git; then + if test -d .git; then ($GIT --version) >/dev/null 2>&1 || GIT=true fi } |