diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | intltool-po-Makefile.in.in-patch-4 | 68 | ||||
| -rw-r--r-- | intltoolize.in | 2 |
4 files changed, 76 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2002-01-31 ERDI Gergo <cactus@cactus.rulez.org> + + * intltoolize.in: use po/Makefile.in.in patch #4 if latest + Makefile.in.in (from glib-gettextize) is detected + 2002-01-29 Darin Adler <darin@bentspoon.com> * NEWS: Updated for 0.14 release. diff --git a/Makefile.am b/Makefile.am index b66c787..7f94f12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ pkgdata_DATA = \ intltool-po-Makefile.in.in-patch-1 \ intltool-po-Makefile.in.in-patch-2 \ intltool-po-Makefile.in.in-patch-3 \ + intltool-po-Makefile.in.in-patch-4 \ xml-i18n-po-Makefile.in.in-patch-1 \ xml-i18n-po-Makefile.in.in-patch-2 \ $(NULL) diff --git a/intltool-po-Makefile.in.in-patch-4 b/intltool-po-Makefile.in.in-patch-4 new file mode 100644 index 0000000..e3d33fa --- /dev/null +++ b/intltool-po-Makefile.in.in-patch-4 @@ -0,0 +1,68 @@ +--- Makefile.in.in.clean Wed Oct 17 16:15:24 2001 ++++ Makefile.in.in Wed Oct 17 16:15:30 2001 +@@ -14,6 +14,7 @@ + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ ++top_builddir = .. + VPATH = @srcdir@ + + prefix = @prefix@ +@@ -38,7 +39,10 @@ + GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ + MSGFMT = @MSGFMT@ + XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ +-MSGMERGE = PATH=../src:$$PATH msgmerge ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + + DEFS = @DEFS@ + CFLAGS = @CFLAGS@ +@@ -88,12 +92,7 @@ + all-no: + + $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) +- $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ +- --add-comments --keyword=_ --keyword=N_ \ +- --files-from=$(srcdir)/POTFILES.in \ +- && test ! -f $(GETTEXT_PACKAGE).po \ +- || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ +- && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) ++ $(GENPOT) + + $(srcdir)/cat-id-tbl.c: stamp-cat-id; @: + $(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot +@@ -219,9 +218,9 @@ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ +- mv $$lang.po $$lang.old.po; \ ++ cp $$lang.po $$lang.old.po; \ + echo "$$lang:"; \ +- if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \ ++ if $(MSGMERGE) $$lang; then \ + rm -f $$lang.old.po; \ + else \ + echo "msgmerge for $$cat failed!"; \ +@@ -230,6 +229,19 @@ + fi; \ + done + ++.po: Makefile ++ $(MAKE) $(PACKAGE).pot; ++ PATH=`pwd`/../src:$$PATH; \ ++ echo; printf "$*: "; \ ++ if $(MSGMERGE) $*; then \ ++ rm -f $*.old.po; \ ++ else \ ++ echo "msgmerge for * failed!"; \ ++ mv $*.old.po $*.po; \ ++ fi; \ ++ msgfmt --statistics $*.po; echo; ++ ++ + # POTFILES is created from POTFILES.in by stripping comments, empty lines + # and Intltool tags (enclosed in square brackets), and appending a full + # relative path to them diff --git a/intltoolize.in b/intltoolize.in index 4f4c9d3..c5c54e8 100644 --- a/intltoolize.in +++ b/intltoolize.in @@ -236,6 +236,8 @@ done if grep GENPOT po/Makefile.in.in >/dev/null; then echo "no need for patching file 'Makefile.in.in'"; +elif grep '# POTFILES is created from POTFILES.in' po/Makefile.in.in > /dev/null; then + patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-4 elif grep GETTEXT_PACKAGE po/Makefile.in.in >/dev/null; then patch po/Makefile.in.in < $pkgdatadir/intltool-po-Makefile.in.in-patch-3 elif grep builddir po/Makefile.in.in >/dev/null; then |