* merged from the install-recommends branch

[apt.git] / po / makefile

diff --git a/po/makefile b/po/makefile
index 54f40d5efa70f1b48ba6e76d8abd9dfc762035cc..07dc51c075f99fe09b7b5c86dcc77cb2bc79406a 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -15,7 +15,7 @@ SUBDIR=po
 include ../buildlib/defaults.mak
 
 CATALOGS := $(addsuffix .gmo,$(shell cat LINGUAS))
 include ../buildlib/defaults.mak
 
 CATALOGS := $(addsuffix .gmo,$(shell cat LINGUAS))

-DOMAINS = $(notdir $(wildcard $(PO_DOMAINS)/*))
+DOMAINS := $(notdir $(wildcard $(PO_DOMAINS)/*))

 POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS)))
 
 # Construct a list of all mo files for all domains under $(PO_DOMAINS)
 POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS)))
 
 # Construct a list of all mo files for all domains under $(PO_DOMAINS)


@@ -24,10 +24,11 @@ MOFILES := $(foreach D,$(DOMAINS),$(addprefix $(PO_DOMAINS)/$(D)/,$(MOFILES)))
 LANG_POFILES := $(patsubst %.mo,%.po,$(MOFILES))
 LINGUAS := $(patsubst %.gmo,%,$(CATALOGS))
 
 LANG_POFILES := $(patsubst %.mo,%.po,$(MOFILES))
 LINGUAS := $(patsubst %.gmo,%,$(CATALOGS))
 

-GETDOMAIN = $(filter $(DOMAINS),$(subst /, ,$(1)))
+GETDOMAIN = $(word 1,$(subst /, ,$(1)))
+

 # Generate the list of files from the bits the other make files dropped 
 # and produce the .pot file.
 # Generate the list of files from the bits the other make files dropped 
 # and produce the .pot file.

-$(POTFILES) : $(PO)/%.pot : 
+$(POTFILES) : $(PO)/%.pot :

        printf "%s " "Generating POT file $@"
        echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
 # From sh source
        printf "%s " "Generating POT file $@"
        echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
 # From sh source


@@ -39,29 +40,44 @@ $(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/$*

 
 

-$(PO)/$(PACKAGE)-all.pot: $(POTFILES)
+$(PACKAGE)-all.pot: $(POTFILES)

        $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
 
 # Filter the complete translation with the domain specific file to produce
 # only the subtext needed for this domain
 # We cannot express the dependencies required for this directly with a pattern
 # rule, so we use the .d hack.
        $(MSGCOMM) --more-than=0 $(POTFILES) --output=$@
 
 # Filter the complete translation with the domain specific file to produce
 # only the subtext needed for this domain
 # We cannot express the dependencies required for this directly with a pattern
 # rule, so we use the .d hack.

-$(LANG_POFILES) : %.po : $(PO)/$(PACKAGE)-all.pot
+$(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(PACKAGE)-all.pot

        printf "%s " "Generating $@"
        echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
        $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
 
        printf "%s " "Generating $@"
        echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d
        $(MSGMERGE) $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@
 

-$(MOFILES) : %.mo : %.po
+$(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po

        printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
        $(GMSGFMT) --statistics -o $@ $<
        mkdir -p $(LOCALE)/$(notdir $*)/LC_MESSAGES/
        cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
 
        printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"
        $(GMSGFMT) --statistics -o $@ $<
        mkdir -p $(LOCALE)/$(notdir $*)/LC_MESSAGES/
        cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
 

-binary: $(POTFILES) $(PO)/$(PACKAGE)-all.pot $(MOFILES)
+stats:
+       for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+
+binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES)
+
+.PHONY: update-po
+update-po: $(PACKAGE)-all.pot
+       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; \
+       rm -f $$lang.new.po; \
+       done

 
 clean: clean/local
 
 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