--- embedaddon/sudo/Makefile.in	2013/07/22 10:46:10	1.1.1.4
+++ embedaddon/sudo/Makefile.in	2014/06/15 16:12:53	1.1.1.5
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2013 Todd C. Miller <Todd.Miller@courtesan.com>
+# Copyright (c) 2010-2014 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
@@ -33,7 +33,8 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 docdir = @docdir@
 mandir = @mandir@
-timedir = @timedir@
+rundir = @rundir@
+vardir = @vardir@
 
 # User and group ids the installed files should be "owned" by
 install_uid = 0
@@ -70,7 +71,7 @@ LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@
 MSGFMT = msgfmt
 MSGMERGE = msgmerge
 XGETTEXT = xgettext
-XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C. Miller" \
+XGETTEXT_OPTS = -F -k_ -kN_ -kU_ --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 \
@@ -78,39 +79,50 @@ XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C
 		--flag easprintf:3:c-format --flag lbuf_append:2:c-format \
 		--flag lbuf_append_quoted:3:c-format --foreign-user
 
+# Default cppcheck options when run from the top-level Makefile
+CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=constStatement --error-exitcode=1 --inline-suppr -U__cplusplus -UQUAD_MAX -UQUAD_MIN -UUQUAD_MAX -U_POSIX_HOST_NAME_MAX -U_POSIX_PATH_MAX
+
 all: config.status
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 check pre-install: config.status
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
+cppcheck: config.status
+	rval=0; \
+	for d in $(SUBDIRS); do \
+	    echo checking $$d; \
+	    (cd $$d && exec $(MAKE) CPPCHECK_OPTS="$(CPPCHECK_OPTS)" $@) || rval=`expr $$rval + $$?`; \
+	done; \
+	exit $$rval
+
 install-dirs install-binaries install-includes install-plugin: config.status pre-install
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 install-doc: config.status ChangeLog
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 install: config.status ChangeLog pre-install install-nls
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
 uninstall: uninstall-nls
-	for d in $(SUBDIRS); \
-	    do (cd $$d && exec $(MAKE) $@) && continue; \
+	for d in $(SUBDIRS); do \
+	    (cd $$d && exec $(MAKE) $@) && continue; \
 	    exit $$?; \
 	done
 
@@ -181,7 +193,7 @@ update-pot:
 			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 \
+			    -e 's/^mailsub="/gettext "/p' configure.ac \
 			    >> confstr.sh; \
 			tmpfiles=confstr.sh; \
 			cfiles="plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \
@@ -285,7 +297,8 @@ package: sudo.pp
 	    sbindir=$(sbindir) \
 	    libexecdir=$(libexecdir) \
 	    includedir=$(includedir) \
-	    timedir=$(timedir) \
+	    vardir=$(vardir) \
+	    rundir=$(rundir) \
 	    mandir=$(mandir) \
 	    localedir=$(localedir) \
 	    docdir=$(docdir) \