diff --git a/Makefile.in b/Makefile.in index 9251385d2..ecff43bda 100644 --- a/Makefile.in +++ b/Makefile.in @@ -248,14 +248,7 @@ depend: siglist.c signame.c tsgetusershell.c # The CODEOWNERS file is not present in the release tarball. ChangeLog: if test -f $(srcdir)/docs/CODEOWNERS; then \ - if test -d $(srcdir)/.hg && hg -R $(srcdir) identify -ibt >stamp-$@.tmp 2>&1; then \ - cmp stamp-$@.tmp stamp-$@ >/dev/null 2>&1 || { \ - mv -f stamp-$@.tmp stamp-$@; \ - if hg log -R $(srcdir) --template=changelog -r "sort(branch(.) or follow(), -date)" > $@.tmp; then \ - mv -f $@.tmp $(srcdir)/$@; \ - fi; \ - }; \ - elif test -d $(srcdir)/.git && git --git-dir $(srcdir)/.git describe --tags >stamp-$@.tmp 2>&1; then \ + if test -d $(srcdir)/.git && git --git-dir $(srcdir)/.git describe --tags >stamp-$@.tmp 2>&1; then \ cmp stamp-$@.tmp stamp-$@ >/dev/null 2>&1 || { \ mv -f stamp-$@.tmp stamp-$@; \ if $(scriptdir)/log2cl.pl -R $(srcdir)/.git > $@.tmp; then \ @@ -385,10 +378,10 @@ mkdefaults: cd plugins/sudoers && exec $(MAKE) DEVEL=1 ./def_data.c ./def_data.h check-dist: update-pot compile-po mkdefaults - @if test -d $(srcdir)/.hg && cd $(srcdir); then \ - if test `hg stat -am | wc -l` -ne 0; then \ + @if test -d $(srcdir)/.git && cd $(srcdir); then \ + if git status -s | grep -q '^ *M'; then \ echo "Uncommitted changes" 1>&2; \ - hg stat -am 1>&2; \ + git status -s | grep '^ *M'; \ exit 1; \ fi; \ fi