1 files changed, 32 insertions, 80 deletions

diff --git a/po/Makefile.in b/po/Makefile.in
index e9f1dab8..f3c413a1 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2003 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
@@ -8,11 +8,10 @@
 # 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.16
+# Origin: gettext-0.13
 
 PACKAGE = gnunet-gtk
-VERSION = 0.7.1b
-PACKAGE_BUGREPORT = bug-gnunet@gnu.org
+VERSION = 0.7.1c
 
 SHELL = /bin/sh
 
@@ -23,38 +22,18 @@ top_srcdir = ..
 
 prefix = /home/grothoff/
 exec_prefix = ${prefix}
-datarootdir = ${prefix}/share
-datadir = ${datarootdir}
-localedir = ${datarootdir}/locale
+datadir = ${prefix}/share
+localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
+MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# /home/grothoff/svn/gnunet-gtk/install-sh does not start with $(SHELL), so we add it.
-# In automake >= 1.10, mkdir -p -- . is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) /home/grothoff/svn/gnunet-gtk/install-sh -d
-install_sh = $(SHELL) /home/grothoff/svn/gnunet-gtk/install-sh
-MKDIR_P = @MKDIR_P@
-mkdir_p = mkdir -p -- .
-
-GMSGFMT_ = /usr/bin/msgfmt
-GMSGFMT_no = /usr/bin/msgfmt
-GMSGFMT_yes = /usr/bin/msgfmt
-GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = /usr/bin/msgfmt
-MSGFMT_no = /usr/bin/msgfmt
-MSGFMT_yes = /usr/bin/msgfmt
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = /usr/bin/xgettext
-XGETTEXT_no = /usr/bin/xgettext
-XGETTEXT_yes = /usr/bin/xgettext
-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+GMSGFMT = /usr/bin/msgfmt
+MSGFMT = /usr/bin/msgfmt
+XGETTEXT = /usr/bin/xgettext
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = /usr/bin/msgmerge --update
 MSGINIT = msginit
@@ -67,7 +46,7 @@ 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 \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
@@ -78,7 +57,7 @@ CATALOGS = @CATALOGS@
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
 
 .po.mo:
         @echo "$(MSGFMT) -c -o $@ $<"; \
@@ -100,12 +79,6 @@ all: all-yes
 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,
@@ -115,13 +88,10 @@ all-no:
 # $(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; \
-        }
+        test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+        @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
@@ -130,16 +100,11 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # 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"
+          --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 && \
@@ -165,20 +130,16 @@ $(srcdir)/$(DOMAIN).pot:
 # 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
+        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+        echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+        cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
 
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-yes
         if test "$(PACKAGE)" = "gettext-tools"; then \
-          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
           for file in $(DISTFILES.common) Makevars.template; do \
             $(INSTALL_DATA) $(srcdir)/$$file \
                             $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -191,13 +152,13 @@ install-data: install-data-yes
         fi
 install-data-no: all
 install-data-yes: all
-        $(mkdir_p) $(DESTDIR)$(datadir)
+        $(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; \
-          $(mkdir_p) $(DESTDIR)$$dir; \
+          $(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"; \
@@ -237,19 +198,19 @@ installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-yes
         if test "$(PACKAGE)" = "gettext-tools"; then \
-          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
         else \
           : ; \
         fi
 installdirs-data-no:
 installdirs-data-yes:
-        $(mkdir_p) $(DESTDIR)$(datadir)
+        $(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; \
-          $(mkdir_p) $(DESTDIR)$$dir; \
+          $(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 \
@@ -324,14 +285,11 @@ dist distdir:
         $(MAKE) update-po
         @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(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; \
@@ -343,9 +301,9 @@ dist2: stamp-po $(DISTFILES)
         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; \
+            cp -p $$file $(distdir); \
           else \
-            cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+            cp -p $(srcdir)/$$file $(distdir); \
           fi; \
         done
 
@@ -354,13 +312,6 @@ update-po: Makefile
         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:
@@ -392,9 +343,10 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
         @:
 
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
         cd $(top_builddir) \
-          && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+          && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+               $(SHELL) ./config.status
 
 force: