test framework: Unset http proxy variables in setupenvironment

[apt.git] / po / makefile

diff --git a/po/makefile b/po/makefile
index c654cb03305021ad613b019995cfc60a384da042..f42d476a3d9258cd1bf306efebf71c0fc5382af1 100644 (file)
--- 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' ' '))
 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)
 POTFILES := $(addsuffix .pot,$(addprefix $(PO)/,$(DOMAINS)))
 
 # Construct a list of all mo files for all domains under $(PO_DOMAINS)


@@ -40,7 +40,7 @@ $(POTFILES) : $(PO)/%.pot :
        cat $(PO)/domains/$*/*.srclist | sort > $(PO)/POTFILES_$*.in
        $(XGETTEXT) --default-domain=$* --directory=$(BASE) \
          --add-comments --foreign --keyword=_ --keyword=N_ \
        cat $(PO)/domains/$*/*.srclist | sort > $(PO)/POTFILES_$*.in
        $(XGETTEXT) --default-domain=$* --directory=$(BASE) \
          --add-comments --foreign --keyword=_ --keyword=N_ \

-          --no-location \
+          --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 || \
          --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 || \


@@ -59,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
 $(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"
 
 $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
        printf "%s: " "Generating $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo"