Fixes from coreutils sync: some files now required and removed generateable files

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1395 f882894a-f735-0410-b71e-b25c423dba1c

2 files changed, 384 insertions, 1 deletions

diff --git a/po/.cvsignore b/po/.cvsignore
index e925c3a..7e7b867 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,6 +1,5 @@
 Makefile
 Makefile.in
-Makefile.in.in
 Rules-quot
 boldquot.sed
 de.gmo
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..12b73cf
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,384 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.15
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+        @echo "$(MSGFMT) -c -o $@ $<"; \
+        $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+        @lang=`echo $* | sed -e 's,.*/,,'`; \
+        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+        echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+        cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+        sed -e '/^#/d' $< > t-$@
+        mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+        test ! -f $(srcdir)/$(DOMAIN).pot || \
+          test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+        @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+          echo "touch stamp-po" && \
+          echo timestamp > stamp-poT && \
+          mv stamp-poT stamp-po; \
+        }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+        else \
+          msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+        fi; \
+        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+          --files-from=$(srcdir)/POTFILES.in \
+          --copyright-holder='$(COPYRIGHT_HOLDER)' \
+          --msgid-bugs-address="$$msgid_bugs_address"
+        test ! -f $(DOMAIN).po || { \
+          if test -f $(srcdir)/$(DOMAIN).pot; then \
+            sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+            sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+            if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+              rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+            else \
+              rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+              mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+            fi; \
+          else \
+            mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+          fi; \
+        }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+        $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+        @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+        if test -f "$(srcdir)/$${lang}.po"; then \
+          test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+          echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+          cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+        else \
+          $(MAKE) $${lang}.po-create; \
+        fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+          for file in $(DISTFILES.common) Makevars.template; do \
+            $(INSTALL_DATA) $(srcdir)/$$file \
+                            $(DESTDIR)$(gettextsrcdir)/$$file; \
+          done; \
+          for file in Makevars; do \
+            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+          done; \
+        else \
+          : ; \
+        fi
+install-data-no: all
+install-data-yes: all
+        $(mkinstalldirs) $(DESTDIR)$(datadir)
+        @catalogs='$(CATALOGS)'; \
+        for cat in $$catalogs; do \
+          cat=`basename $$cat`; \
+          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+          dir=$(localedir)/$$lang/LC_MESSAGES; \
+          $(mkinstalldirs) $(DESTDIR)$$dir; \
+          if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+          $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+          echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+          for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+            if test -n "$$lc"; then \
+              if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+                link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+                mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+                mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                 for file in *; do \
+                   if test -f $$file; then \
+                     ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                   fi; \
+                 done); \
+                rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+              else \
+                if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                  :; \
+                else \
+                  rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                  mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                fi; \
+              fi; \
+              rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+              ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+              ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+              cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+              echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+            fi; \
+          done; \
+        done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+        else \
+          : ; \
+        fi
+installdirs-data-no:
+installdirs-data-yes:
+        $(mkinstalldirs) $(DESTDIR)$(datadir)
+        @catalogs='$(CATALOGS)'; \
+        for cat in $$catalogs; do \
+          cat=`basename $$cat`; \
+          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+          dir=$(localedir)/$$lang/LC_MESSAGES; \
+          $(mkinstalldirs) $(DESTDIR)$$dir; \
+          for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+            if test -n "$$lc"; then \
+              if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+                link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+                mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+                mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                 for file in *; do \
+                   if test -f $$file; then \
+                     ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                   fi; \
+                 done); \
+                rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+              else \
+                if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                  :; \
+                else \
+                  rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                  mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                fi; \
+              fi; \
+            fi; \
+          done; \
+        done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          for file in $(DISTFILES.common) Makevars.template; do \
+            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+          done; \
+        else \
+          : ; \
+        fi
+uninstall-data-no:
+uninstall-data-yes:
+        catalogs='$(CATALOGS)'; \
+        for cat in $$catalogs; do \
+          cat=`basename $$cat`; \
+          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+          for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+            rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+          done; \
+        done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+        rm -f remove-potcdate.sed
+        rm -f stamp-poT
+        rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+        rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+        rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+        @echo "This command is intended for maintainers to use;"
+        @echo "it deletes files that may require special tools to rebuild."
+        rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+        $(MAKE) update-po
+        @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+        dists="$(DISTFILES)"; \
+        if test "$(PACKAGE)" = "gettext-tools"; then \
+          dists="$$dists Makevars.template"; \
+        fi; \
+        if test -f $(srcdir)/$(DOMAIN).pot; then \
+          dists="$$dists $(DOMAIN).pot stamp-po"; \
+        fi; \
+        if test -f $(srcdir)/ChangeLog; then \
+          dists="$$dists ChangeLog"; \
+        fi; \
+        for i in 0 1 2 3 4 5 6 7 8 9; do \
+          if test -f $(srcdir)/ChangeLog.$$i; then \
+            dists="$$dists ChangeLog.$$i"; \
+          fi; \
+        done; \
+        if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+        for file in $$dists; do \
+          if test -f $$file; then \
+            cp -p $$file $(distdir) || exit 1; \
+          else \
+            cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+          fi; \
+        done
+
+update-po: Makefile
+        $(MAKE) $(DOMAIN).pot-update
+        test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+        $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+        @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+        echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+        exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+        @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+        if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+        tmpdir=`pwd`; \
+        echo "$$lang:"; \
+        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+        echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+        cd $(srcdir); \
+        if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+            rm -f $$tmpdir/$$lang.new.po; \
+          else \
+            if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+              :; \
+            else \
+              echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+              exit 1; \
+            fi; \
+          fi; \
+        else \
+          echo "msgmerge for $$lang.po failed!" 1>&2; \
+          rm -f $$tmpdir/$$lang.new.po; \
+        fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+        @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+        cd $(top_builddir) \
+          && $(SHELL) ./config.status $(subdir)/$@.in
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT: