--- embedaddon/sudo/Makefile.in	2012/10/09 09:29:52	1.1.1.3
+++ embedaddon/sudo/Makefile.in	2013/07/22 10:46:10	1.1.1.4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2011 Todd C. Miller <Todd.Miller@courtesan.com>
+# Copyright (c) 2010-2013 Todd C. Miller <Todd.Miller@courtesan.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -46,9 +46,10 @@ sudoers_gid = @SUDOERS_GID@
 sudoers_mode = @SUDOERS_MODE@
 shlib_mode = @SHLIB_MODE@
 
-SUBDIRS = compat common @ZLIB_SRC@ plugins/sudoers src include doc
+SUBDIRS = compat common @ZLIB_SRC@ plugins/group_file plugins/sudoers \
+	  plugins/system_group src include doc
 
-SAMPLES = plugins/sample plugins/sample_group plugins/system_group
+SAMPLES = plugins/sample
 
 VERSION = @PACKAGE_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -65,6 +66,7 @@ ECHO_C = @ECHO_C@
 # Message catalog support
 NLS = @SUDO_NLS@
 POTFILES = src/po/sudo.pot plugins/sudoers/po/sudoers.pot
+LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@
 MSGFMT = msgfmt
 MSGMERGE = msgmerge
 XGETTEXT = xgettext
@@ -72,12 +74,12 @@ XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C
 		"--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 \
-		--flag error:2:c-format --flag errorx:2:c-format \
+		--flag fatal:1:c-format --flag fatalx:1:c-format \
 		--flag easprintf:3:c-format --flag lbuf_append:2:c-format \
 		--flag lbuf_append_quoted:3:c-format --foreign-user
 
 all: config.status
-	for d in $(SUBDIRS) $(SAMPLES); \
+	for d in $(SUBDIRS); \
 	    do (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
@@ -118,9 +120,6 @@ uninstall-nls:
 	    rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/$$domain.mo; \
 	done
 
-autoconf:
-	autoconf -I m4
-
 siglist.c signame.c:
 	(cd compat && exec $(MAKE) $@)
 
@@ -131,14 +130,14 @@ depend: siglist.c signame.c
 	fi; \
 	$(srcdir)/mkdep.pl $(srcdir)/common/Makefile.in \
 	    $(srcdir)/compat/Makefile.in $(srcdir)/plugins/sample/Makefile.in \
-	    $(srcdir)/plugins/sample_group/Makefile.in \
+	    $(srcdir)/plugins/group_file/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/group_file/Makefile \
 	    --file $(srcdir)/plugins/sudoers/Makefile \
 	    --file $(srcdir)/plugins/system_group/Makefile \
 	    --file $(srcdir)/src/Makefile --file $(srcdir)/zlib/Makefile
@@ -177,15 +176,25 @@ update-pot:
 		echo "Updating $$pot"; \
 		domain=`basename $$pot .pot`; \
 		case "$$domain" in \
-		    sudo) cfiles="src/*c common/*c compat/*c";; \
-		    sudoers) cfiles="plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \
+		    sudo) tmpfiles=; cfiles="src/*c common/*c compat/*c";; \
+		    sudoers) \
+			echo "syntax error" > confstr.sh; \
+			sed -n -e 's/^badpass_message="/gettext "/p' \
+			    -e 's/^passprompt="/gettext "/p' \
+			    -e 's/^mailsub="/gettext "/p' configure.in \
+			    >> confstr.sh; \
+			tmpfiles=confstr.sh; \
+			cfiles="plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \
 		    *) echo unknown domain $$domain; continue;; \
 		esac; \
-		$(XGETTEXT) $(XGETTEXT_OPTS) -d$$domain $$cfiles -o $$pot.tmp; \
+		$(XGETTEXT) $(XGETTEXT_OPTS) -d$$domain $$cfiles $$tmpfiles -o $$pot.tmp; \
+		test -n "$$tmpfiles" && rm -f $$tmpfiles; \
 		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; \
+		    printf '/^#$$/+1,$$d\nw\nq\n' | ed - $$pot; \
+		    sed '1,/^#$$/d' $$pot.tmp >> $$pot; \
+		    rm -f $$pot.tmp; \
 		fi; \
 	    done; \
 	fi
@@ -237,6 +246,11 @@ install-nls:
 		    test -s $$podir/$$lang.mo || continue; \
 		    echo $(ECHO_N) " $$lang$(ECHO_C)"; \
 		    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+		    if test -n "$(LOCALEDIR_SUFFIX)"; then \
+			if test ! -d $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); then \
+			    ln -s $$lang $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); \
+			fi; \
+		    fi; \
 		    $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \
 		done; \
 		echo ""; \
@@ -245,13 +259,16 @@ install-nls:
 
 check-dist: update-pot compile-po
 	@if [ -d .hg ]; then \
-	    if hg stat -am | grep '\.[mp]ot*$$'; then \
-		echo "Uncommitted message catalog changes" 1>&2; \
-		false; \
+	    if test `hg stat -am | wc -l` -ne 0; then \
+		echo "Uncommitted changes" 1>&2; \
+		hg stat -am 1>&2; \
+		exit 1; \
 	    fi; \
 	fi
 
-dist: check-dist ChangeLog $(srcdir)/MANIFEST
+dist: check-dist force-dist
+
+force-dist: ChangeLog $(srcdir)/MANIFEST
 	pax -w -x ustar -s '/^/$(PACKAGE_TARNAME)-$(VERSION)\//' \
 	    -f ../$(PACKAGE_TARNAME)-$(VERSION).tar \
 	    `sed 's/[ 	].*//' $(srcdir)/MANIFEST`