* merged from apt--mvo

[apt.git] / po / makefile

diff --git a/po/makefile b/po/makefile
index 6ad6997c0659d997a150f0af65a37ffabe884c50..07dc51c075f99fe09b7b5c86dcc77cb2bc79406a 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -40,6 +40,9 @@ $(POTFILES) : $(PO)/%.pot :
          --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
        rm -f $(PO)/POTFILES_$*.in
        $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
          --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
        rm -f $(PO)/POTFILES_$*.in
        $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@

+       # copy into the domain dirs to make rosetta happy
+       rm -f $(PO)/domains/$*/*.pot
+       cp $@ $(PO)/domains/$*

 
 $(PACKAGE)-all.pot: $(POTFILES)
        $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
 
 $(PACKAGE)-all.pot: $(POTFILES)
        $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@


@@ -62,11 +65,11 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
 stats:
        for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
 stats:
        for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 

-binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) update-po
+binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)

 
 .PHONY: update-po
 update-po: $(PACKAGE)-all.pot
 
 .PHONY: update-po
 update-po: $(PACKAGE)-all.pot

-       for lang in ${LINGUAS}; do\
+       for lang in ${LINGUAS}; do \

        echo "Updating $$lang.po"; \
        $(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \
        cmp $$lang.new.po $$lang.po || cp $$lang.new.po $$lang.po; \
        echo "Updating $$lang.po"; \
        $(MSGMERGE) $$lang.po $(PACKAGE)-all.pot -o $$lang.new.po; \
        cmp $$lang.new.po $$lang.po || cp $$lang.new.po $$lang.po; \


@@ -74,7 +77,7 @@ update-po: $(PACKAGE)-all.pot
        done
 
 clean: clean/local
        done
 
 clean: clean/local

-clean/local:
+clean/local: update-po

        rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d
 
 # Include the dependencies that are available
        rm -f $(MOFILES) $(LANG_POFILES) $(PO)/*.d
 
 # Include the dependencies that are available