X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.in;h=1fbed4cd05b14762342247ca399ae6079ea2cb35;hb=2e444a5714593fb7659157cee2e7037577c0bdcd;hp=fcfbbc9ce0b0a3b7a514e628d01d48025e5cb456;hpb=ca5f7615983706c51b50ac5a8bfc4e123263df0e;p=debian%2Fsudo

diff --git a/Makefile.in b/Makefile.in
index fcfbbc9..1fbed4c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,7 @@ sudoers_mode = @SUDOERS_MODE@
 
 SUBDIRS = compat common @ZLIB_SRC@ plugins/sudoers src include doc
 
-SAMPLES = plugins/sample plugins/sample_group
+SAMPLES = plugins/sample plugins/sample_group plugins/system_group
 
 VERSION = @PACKAGE_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -67,7 +67,7 @@ POTFILES = src/po/sudo.pot plugins/sudoers/po/sudoers.pot
 MSGFMT = msgfmt
 MSGMERGE = msgmerge
 XGETTEXT = xgettext
-XGETTEXT_OPTS = -k_ -kN_ --copyright-holder="Todd C. Miller" \
+XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C. Miller" \
 		"--msgid-bugs-address=http://www.sudo.ws/bugs" \
 		--package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
 		--flag warning:1:c-format --flag warningx:1:c-format \
@@ -132,18 +132,19 @@ depend: siglist.c
 	    $(srcdir)/compat/Makefile.in $(srcdir)/plugins/sample/Makefile.in \
 	    $(srcdir)/plugins/sample_group/Makefile.in \
 	    $(srcdir)/plugins/sudoers/Makefile.in \
+	    $(srcdir)/plugins/system_group/Makefile.in \
 	    $(srcdir)/src/Makefile.in $(srcdir)/zlib/Makefile.in; \
 	./config.status --file $(srcdir)/common/Makefile \
 	    --file $(srcdir)/compat/Makefile \
 	    --file $(srcdir)/plugins/sample/Makefile \
 	    --file $(srcdir)/plugins/sample_group/Makefile \
 	    --file $(srcdir)/plugins/sudoers/Makefile \
+	    --file $(srcdir)/plugins/system_group/Makefile \
 	    --file $(srcdir)/src/Makefile --file $(srcdir)/zlib/Makefile
 
-# The 1.8 branch started February 25, 2011
 ChangeLog:
 	if test -d $(srcdir)/.hg && cd $(srcdir); then \
-	    if hg log --style=changelog -b 1.8 > $@.tmp && hg log --style=changelog -b default --date '<2011-02-25 21:30:00' >> $@.tmp; then \
+	    if hg log --style=changelog -b default > $@.tmp; then \
 		mv -f $@.tmp $@; \
 	    else \
 		rm -f $@.tmp; \
@@ -180,7 +181,7 @@ update-pot:
 		    *) echo unknown domain $$domain; continue;; \
 		esac; \
 		$(XGETTEXT) $(XGETTEXT_OPTS) -d$$domain $$cfiles -o $$pot.tmp; \
-		if diff -I'^.POT-Creation-Date' $$pot.tmp $$pot >/dev/null; then \
+		if diff -I'^.POT-Creation-Date' -I'^.Project-Id-Version' -I'^#' $$pot.tmp $$pot >/dev/null; then \
 		    rm -f $$pot.tmp; \
 		else \
 		    mv -f $$pot.tmp $$pot; \