diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 16 |
3 files changed, 20 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2015-03-24 Kaz Kylheku <kaz@kylheku.com> + + * Makefile (enforce): Update error error message. + + * configure (have_git): Don't set this variable if + the TXR repository is missing, even if git is installed. + I.e. have_git means have have the tool and the repo. + 2015-03-20 Kaz Kylheku <kaz@kylheku.com> * lib.c (int_str): Workaround for wcstol recognizing the 0x prefix when @@ -318,8 +318,8 @@ ifneq ($(have_git),) $(call GREP_CHECK,' ',tabs,0,'.') $(call GREP_CHECK,' $$',trailing spaces,0,'.') else - echo "enforce requires git" - exit 1 + $(V)echo "enforce requires the git program and a git repository" + $(V)exit 1 endif # @@ -719,14 +719,18 @@ conftest_syms() # # Check for git because we use it out of the Makefile +# But this is pointless if we have no git repo. +# "have_git" means we have a repo, and git. # -printf "Checking whether we have git ... " +if [ -d $top_srcdir/.git ] ; then + printf "Checking whether we have git ... " -if git --version > /dev/null 2> /dev/null ; then - have_git=y - printf "yes\n" -else - printf "missing\n" + if git --version > /dev/null 2> /dev/null ; then + have_git=y + printf "yes\n" + else + printf "missing\n" + fi fi # |