X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d7a4635391d9ff36152603ab6faa6eafa206750a..cc0a4c82b3c132abba9b9ec35fd61bc8b45a1b80:/po/makefile diff --git a/po/makefile b/po/makefile index b239da5cc..f42d476a3 100644 --- a/po/makefile +++ b/po/makefile @@ -15,7 +15,7 @@ SUBDIR=po include ../buildlib/defaults.mak CATALOGS := $(addsuffix .gmo, $(shell sed -e '/^\#/ d' -e '/^$$/ d' LINGUAS | tr '\n' ' ')) -DOMAINS := $(notdir $(wildcard $(PO_DOMAINS)/*)) +DOMAINS := $(sort $(notdir $(wildcard $(PO_DOMAINS)/*))) POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS))) # Construct a list of all mo files for all domains under $(PO_DOMAINS) @@ -37,9 +37,10 @@ $(POTFILES) : $(PO)/%.pot : cmp --silent $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot || \ mv $(PO)/domains/$*/sh.pot.tmp $(PO)/domains/$*/sh.pot # From C/C++ source - cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in + cat $(PO)/domains/$*/*.srclist | sort > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ + --add-location=file \ --keyword=P_:1,2 \ --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \ @@ -58,7 +59,7 @@ $(POTFILES) : $(PO)/%.pot : $(LANG_POFILES) : $(PO_DOMAINS)/%.po : $(POTFILES) printf "%s " "Generating $@" echo $@ : $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot > $(PO)/$(call GETDOMAIN,$*)_$(notdir $@).d - $(MSGMERGE) --no-location $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ + $(MSGMERGE) --add-location=file $(notdir $@) $(PO)/$(call GETDOMAIN,$*).pot -o $@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"