Diff for /embedaddon/sudo/Makefile.in between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/07/22 10:46:10 version 1.1.1.5, 2014/06/15 16:12:53
Line 1 Line 1
 #  #
# 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  # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above  # purpose with or without fee is hereby granted, provided that the above
Line 33  localedir = @localedir@ Line 33  localedir = @localedir@
 localstatedir = @localstatedir@  localstatedir = @localstatedir@
 docdir = @docdir@  docdir = @docdir@
 mandir = @mandir@  mandir = @mandir@
timedir = @timedir@rundir = @rundir@
 vardir = @vardir@
   
 # User and group ids the installed files should be "owned" by  # User and group ids the installed files should be "owned" by
 install_uid = 0  install_uid = 0
Line 70  LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@ Line 71  LOCALEDIR_SUFFIX = @LOCALEDIR_SUFFIX@
 MSGFMT = msgfmt  MSGFMT = msgfmt
 MSGMERGE = msgmerge  MSGMERGE = msgmerge
 XGETTEXT = xgettext  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" \                  "--msgid-bugs-address=http://www.sudo.ws/bugs" \
                 --package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \                  --package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
                 --flag warning:1:c-format --flag warningx:1:c-format \                  --flag warning:1:c-format --flag warningx:1:c-format \
Line 78  XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C Line 79  XGETTEXT_OPTS = -F -k_ -kN_ --copyright-holder="Todd C
                 --flag easprintf:3:c-format --flag lbuf_append:2:c-format \                  --flag easprintf:3:c-format --flag lbuf_append:2:c-format \
                 --flag lbuf_append_quoted:3:c-format --foreign-user                  --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  all: config.status
        for d in $(SUBDIRS); \        for d in $(SUBDIRS); do \
            do (cd $$d && exec $(MAKE) $@) && continue; \            (cd $$d && exec $(MAKE) $@) && continue; \
             exit $$?; \              exit $$?; \
         done          done
   
 check pre-install: config.status  check pre-install: config.status
        for d in $(SUBDIRS); \        for d in $(SUBDIRS); do \
            do (cd $$d && exec $(MAKE) $@) && continue; \            (cd $$d && exec $(MAKE) $@) && continue; \
             exit $$?; \              exit $$?; \
         done          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  install-dirs install-binaries install-includes install-plugin: config.status pre-install
        for d in $(SUBDIRS); \        for d in $(SUBDIRS); do \
            do (cd $$d && exec $(MAKE) $@) && continue; \            (cd $$d && exec $(MAKE) $@) && continue; \
             exit $$?; \              exit $$?; \
         done          done
   
 install-doc: config.status ChangeLog  install-doc: config.status ChangeLog
        for d in $(SUBDIRS); \        for d in $(SUBDIRS); do \
            do (cd $$d && exec $(MAKE) $@) && continue; \            (cd $$d && exec $(MAKE) $@) && continue; \
             exit $$?; \              exit $$?; \
         done          done
   
 install: config.status ChangeLog pre-install install-nls  install: config.status ChangeLog pre-install install-nls
        for d in $(SUBDIRS); \        for d in $(SUBDIRS); do \
            do (cd $$d && exec $(MAKE) $@) && continue; \            (cd $$d && exec $(MAKE) $@) && continue; \
             exit $$?; \              exit $$?; \
         done          done
   
 uninstall: uninstall-nls  uninstall: uninstall-nls
        for d in $(SUBDIRS); \        for d in $(SUBDIRS); do \
            do (cd $$d && exec $(MAKE) $@) && continue; \            (cd $$d && exec $(MAKE) $@) && continue; \
             exit $$?; \              exit $$?; \
         done          done
   
Line 181  update-pot: Line 193  update-pot:
                         echo "syntax error" > confstr.sh; \                          echo "syntax error" > confstr.sh; \
                         sed -n -e 's/^badpass_message="/gettext "/p' \                          sed -n -e 's/^badpass_message="/gettext "/p' \
                             -e 's/^passprompt="/gettext "/p' \                              -e 's/^passprompt="/gettext "/p' \
                            -e 's/^mailsub="/gettext "/p' configure.in \                            -e 's/^mailsub="/gettext "/p' configure.ac \
                             >> confstr.sh; \                              >> confstr.sh; \
                         tmpfiles=confstr.sh; \                          tmpfiles=confstr.sh; \
                         cfiles="plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \                          cfiles="plugins/sudoers/*.c plugins/sudoers/auth/*.c";; \
Line 285  package: sudo.pp Line 297  package: sudo.pp
             sbindir=$(sbindir) \              sbindir=$(sbindir) \
             libexecdir=$(libexecdir) \              libexecdir=$(libexecdir) \
             includedir=$(includedir) \              includedir=$(includedir) \
            timedir=$(timedir) \            vardir=$(vardir) \
             rundir=$(rundir) \
             mandir=$(mandir) \              mandir=$(mandir) \
             localedir=$(localedir) \              localedir=$(localedir) \
             docdir=$(docdir) \              docdir=$(docdir) \

Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>