Skrewing with the build environment.

[glabels] / glabels2 / po / Makefile.in.in

diff --git a/glabels2/po/Makefile.in.in b/glabels2/po/Makefile.in.in
index 20ccd417613335a5df06f35d4c5180b3d1fe938c..8f116b1895d1212c14eb712281c550475f70617e 100644 (file)
--- a/glabels2/po/Makefile.in.in
+++ b/glabels2/po/Makefile.in.in
@@ -21,6 +21,7 @@ SHELL = /bin/sh
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = ..
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -40,7 +41,10 @@ GENCAT = @GENCAT@
 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@
@@ -90,12 +94,7 @@ all-yes: $(CATALOGS)
 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)
 
 install: install-exec install-data
 install-exec:
@@ -204,9 +203,9 @@ update-po: Makefile
        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!"; \
@@ -215,6 +214,19 @@ update-po: Makefile
          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