Skip to content

Commit cb4e267

Browse files
committed
We now build sudo releases from git, not mercurial
1 parent 23aff2b commit cb4e267

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

Makefile.in

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,7 @@ depend: siglist.c signame.c tsgetusershell.c
248248
# The CODEOWNERS file is not present in the release tarball.
249249
ChangeLog:
250250
if test -f $(srcdir)/docs/CODEOWNERS; then \
251-
if test -d $(srcdir)/.hg && hg -R $(srcdir) identify -ibt >stamp-$@.tmp 2>&1; then \
252-
cmp stamp-$@.tmp stamp-$@ >/dev/null 2>&1 || { \
253-
mv -f stamp-$@.tmp stamp-$@; \
254-
if hg log -R $(srcdir) --template=changelog -r "sort(branch(.) or follow(), -date)" > $@.tmp; then \
255-
mv -f $@.tmp $(srcdir)/$@; \
256-
fi; \
257-
}; \
258-
elif test -d $(srcdir)/.git && git --git-dir $(srcdir)/.git describe --tags >stamp-$@.tmp 2>&1; then \
251+
if test -d $(srcdir)/.git && git --git-dir $(srcdir)/.git describe --tags >stamp-$@.tmp 2>&1; then \
259252
cmp stamp-$@.tmp stamp-$@ >/dev/null 2>&1 || { \
260253
mv -f stamp-$@.tmp stamp-$@; \
261254
if $(scriptdir)/log2cl.pl -R $(srcdir)/.git > $@.tmp; then \
@@ -385,10 +378,10 @@ mkdefaults:
385378
cd plugins/sudoers && exec $(MAKE) DEVEL=1 ./def_data.c ./def_data.h
386379

387380
check-dist: update-pot compile-po mkdefaults
388-
@if test -d $(srcdir)/.hg && cd $(srcdir); then \
389-
if test `hg stat -am | wc -l` -ne 0; then \
381+
@if test -d $(srcdir)/.git && cd $(srcdir); then \
382+
if git status -s | grep -q '^ *M'; then \
390383
echo "Uncommitted changes" 1>&2; \
391-
hg stat -am 1>&2; \
384+
git status -s | grep '^ *M'; \
392385
exit 1; \
393386
fi; \
394387
fi

0 commit comments

Comments
 (0)