2 files changed, 27 insertions, 15 deletions

diff --git a/po/.cvsignore b/po/.cvsignore
index 879daef9..2995ce49 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,5 +1,6 @@
 Makefile
 Makefile.in
+remove-potcdate.sed
 Rules-quot
 boldquot.sed
 de.gmo
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 12b73cfe..e7d1ab2d 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,7 @@
+# -*- buffer-read-only: t -*- vi: set ro:
+# DO NOT EDIT! GENERATED AUTOMATICALLY!
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 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
@@ -25,17 +27,26 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+mkinstalldirs = $(SHELL) @install_sh@ -d
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -159,7 +170,7 @@ install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
         if test "$(PACKAGE)" = "gettext-tools"; then \
-          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
           for file in $(DISTFILES.common) Makevars.template; do \
             $(INSTALL_DATA) $(srcdir)/$$file \
                             $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -172,13 +183,13 @@ install-data: install-data-@USE_NLS@
         fi
 install-data-no: all
 install-data-yes: all
-        $(mkinstalldirs) $(DESTDIR)$(datadir)
+        $(mkdir_p) $(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; \
+          $(mkdir_p) $(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"; \
@@ -218,19 +229,19 @@ installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
         if test "$(PACKAGE)" = "gettext-tools"; then \
-          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
         else \
           : ; \
         fi
 installdirs-data-no:
 installdirs-data-yes:
-        $(mkinstalldirs) $(DESTDIR)$(datadir)
+        $(mkdir_p) $(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; \
+          $(mkdir_p) $(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 \
@@ -375,7 +386,7 @@ update-gmo: Makefile $(GMOFILES)
 
 Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
         cd $(top_builddir) \
-          && $(SHELL) ./config.status $(subdir)/$@.in
+          && $(SHELL) ./config.status $(subdir)/$@.in po-directories
 
 force: