aboutsummaryrefslogblamecommitdiffstats
path: root/po/Makefile.i18npatch
blob: 98837e85c2d7fd7f68d5f521cf6a39bb7c66c3b3 (plain) (tree)






























































                                                                                         
--- Makefile.in.in.clean    Sat Oct 28 15:31:52 2000
+++ Makefile.in.in  Sat Oct 28 16:11:18 2000
@@ -33,7 +33,9 @@
 GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
+MSGMERGE = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --dist
+GENPOT   = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --pot
+GENHEAD  = PATH=$(top_srcdir)/po:../src:$$PATH perl $(top_srcdir)/po/update.pl --headers
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -47,7 +49,7 @@
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) update.pl ui-extract.pl
 
 POTFILES = \
 
@@ -83,12 +85,7 @@
 all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
-   $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-     --add-comments --keyword=_ --keyword=N_ \
-     --files-from=$(srcdir)/POTFILES.in \
-   && test ! -f $(PACKAGE).po \
-      || ( rm -f $(srcdir)/$(PACKAGE).pot \
-       && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+   $(GENPOT)
 
 $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
 $(srcdir)/stamp-cat-id: $(PACKAGE).pot
@@ -214,18 +211,21 @@
    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 $(PACKAGE).pot -o $$lang.po; then \
-       rm -f $$lang.old.po; \
+     if $(MSGMERGE) $$lang; then \
+     rm -f $$lang.old.po; \
      else \
        echo "msgmerge for $$cat failed!"; \
-       rm -f $$lang.po; \
        mv $$lang.old.po $$lang.po; \
      fi; \
    done
 
-POTFILES: POTFILES.in
+.headerlock:
+   $(GENHEAD)
+   touch .headerlock
+
+POTFILES: POTFILES.in .headerlock
    ( if test 'x$(srcdir)' != 'x.'; then \
        posrcprefix='$(top_srcdir)/'; \
      else \