Re: (no subject)

[Malcolm Tredinnick <malcolm commsecure com au>]

On Wed, May 21, 2003 at 04:32:53PM -0400, Havoc Pennington wrote:
> On Wed, May 21, 2003 at 10:27:26PM +0200, Christian Rose wrote: 
> > They can have it up-to-date anyway by just running "intltool-update xy"
> > first.
> 
> OK, so let's change what distcheck does. I'm tired of waiting for all
> the po update stuff to run when I distcheck anyhow - it takes
> forever. ;-)

This is not too hard to change (although it is the 'dist' target that
does the updating, not distcheck). The attached patch to glib's
po/Makefile.in.in removes the regeneration. For testing purposes, just
apply it to the po/Makefile.in.in file of any module and rebuild from
'configure' upwards (don't autogen.sh again, or you will overwrite the
change you just made).

Maybe a couple of people want to try it out to check I haven't screwed
up (I have only just finished a full rebuild, so I am not about to redo
that tonight). Then somebody can take it from there if nobody comes up
with an argument against.

[Note for those who may be concerned: not having completely up-to-date
po files in tarballs is not a problem. The generated MO files used the
original strings to look up the translations, not the line numbers in
the comments of the PO file or anything like that.]

Cheers,
Malcolm

-- 
Monday is an awful way to spend 1/7th of your life.

Index: po/Makefile.in.in
===================================================================
RCS file: /cvs/gnome/glib/po/Makefile.in.in,v
retrieving revision 1.12.2.1
diff -u -r1.12.2.1 Makefile.in.in
--- po/Makefile.in.in	6 Mar 2003 00:26:35 -0000	1.12.2.1
+++ po/Makefile.in.in	22 May 2003 12:03:43 -0000
@@ -192,38 +192,11 @@
 	rm -f $(GMOFILES)
 
 distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+dist distdir: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
 	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
 	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).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; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
 	done
 
 # POTFILES is created from POTFILES.in by stripping comments, empty lines