fix off-by-one error and do not use magic constant of 100 when checking StackPost

[apt.git] / po / makefile

diff --git a/po/makefile b/po/makefile
index 46b75ff4f721ce814a3716fc0107f13b5367606d..5a3c7fb678552de44bb2cc07a610c09e1e4ebeb0 100644 (file)
--- a/po/makefile
+++ b/po/makefile
@@ -30,17 +30,23 @@ GETDOMAIN = $(word 1,$(subst /, ,$(1)))
 # and produce the .pot file.
 $(POTFILES) : $(PO)/%.pot :
        echo "Generating POT file $@"
 # and produce the .pot file.
 $(POTFILES) : $(PO)/%.pot :
        echo "Generating POT file $@"

-       echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d
+       echo $@ : $(wildcard $(PO)/domains/$*/*.*list) $(addprefix $(BASE)/,$(shell cat $(wildcard $(PO)/domains/$*/*.srclist))) > $@.d.tmp
+       cmp --silent $@.d.tmp $@.d || mv $@.d.tmp $@.d

 # From sh source
 # From sh source

-       cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot
+       cat $(PO)/domains/$*/*.shlist 2> /dev/null | (cd $(BASE) && xargs -n1 bash --dump-po-strings) > $(PO)/domains/$*/sh.pot.tmp
+       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
        $(XGETTEXT) --default-domain=$* --directory=$(BASE) \
          --add-comments --foreign --keyword=_ --keyword=N_ \
          --keyword=P_:1,2 \
 # From C/C++ source
        cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in
        $(XGETTEXT) --default-domain=$* --directory=$(BASE) \
          --add-comments --foreign --keyword=_ --keyword=N_ \
          --keyword=P_:1,2 \

-         --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot
+         --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot.tmp
+       cmp --silent $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot || \
+               mv $(PO)/domains/$*/c.pot.tmp $(PO)/domains/$*/c.pot

        rm -f $(PO)/POTFILES_$*.in
        rm -f $(PO)/POTFILES_$*.in

-       $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@
+       $(MSGCOMM) --omit-header --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@.tmp
+       cmp --silent $@ $@.tmp || mv $@.tmp $@

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


@@ -61,7 +67,7 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
        cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
 
 stats:
        cp $@ $(LOCALE)/$(notdir $*)/LC_MESSAGES/$(call GETDOMAIN,$*).mo
 
 stats:

-       for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
+       for i in *.pot *.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done

 
 binary: $(POTFILES) $(MOFILES)
 
 
 binary: $(POTFILES) $(MOFILES)
 


@@ -69,8 +75,8 @@ $(PACKAGE)-all.pot: $(POTFILES)
        # we create our partial pot files without a header to avoid changing dates in *.mo files,
        # but we want a header for our master-pot file, so we use a dummy pot with nothing but the header
        $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \
        # we create our partial pot files without a header to avoid changing dates in *.mo files,
        # but we want a header for our master-pot file, so we use a dummy pot with nothing but the header
        $(XGETTEXT) --default-domain=$(PO)/$(PACKAGE)-dummy.pot --foreign --language=c \

-               -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name=$(PACKAGE) \
-               --package-version=$(PACKAGE_VERSION) --msgid-bugs-address=deity@lists.debian.org /dev/null
+               -o $(PO)/$(PACKAGE)-dummy.pot --force-po --package-name='$(PACKAGE)' \
+               --package-version='$(PACKAGE_VERSION)' --msgid-bugs-address='$(PACKAGE_MAIL)' /dev/null

        $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot
        rm -f $(PO)/$(PACKAGE)-dummy.pot
 
        $(MSGCOMM) --more-than=0 $(PO)/$(PACKAGE)-dummy.pot $(POTFILES) --output=$(PACKAGE)-all.pot
        rm -f $(PO)/$(PACKAGE)-dummy.pot
 


@@ -93,4 +99,5 @@ ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)
 endif
 
 include $(The_DFiles)
 endif
 

+# otherwise the output is completely screwed

 .NOTPARALLEL:
 .NOTPARALLEL: