<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39524 >
There is several (probably minor) problems related to nb.po creation. - In certain situations msgmerge fails since nb.po is not available - nb.po is updated by copying no.po *before* no.po itself is updated Attached is my attempt to fix these issues. Considering how many different ways this makefile is used, I'm not too sure that even this is completely correct way to do it. For both trunk and S2_1. - ML
diff -Nurd -X.diff_ignore freeciv/po/Makefile.in.in freeciv/po/Makefile.in.in --- freeciv/po/Makefile.in.in 2007-08-04 18:38:22.000000000 +0300 +++ freeciv/po/Makefile.in.in 2007-08-10 13:53:08.000000000 +0300 @@ -165,7 +165,7 @@ cp -p $$dir/$$file $(distdir); \ done -update-po: Makefile +update-po: Makefile nb.po $(MAKE) $(PACKAGE).pot if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ cd $(srcdir); \ @@ -173,9 +173,14 @@ for cat in $$catalogs; do \ cat=`basename $$cat`; \ lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + if test -x "$(builddir)/$$lang.po" ; then \ + dir="$(builddir)"; \ + else \ + dir=. ; \ + fi; \ echo "$$lang:"; \ - if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ - mv -f $$lang.new.po $$lang.po; \ + if $(MSGMERGE) $$dir/$$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$dir/$$lang.po; \ else \ echo "msgmerge for $$cat failed!"; \ rm -f $$lang.new.po; \
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
