Handle addendum if it exists

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@7776 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/Makefile b/Makefile
index 8dac6d1d806b32a4f6e30ad22bebab60c3f933af..6aed88ff03159983cde5e6563472d4f3a6699521 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,11 @@ ifndef LINGUA
 FORCE:
 else
 $(LINGUA)/%.dbk:       %.dbk $(patsubst %.dbk,po4a/$(LINGUA)/%.po,%.dbk)
-# "-a ?" is only possible with po4a version in Squeeze, build is broken in Lenny with it
-       $(TRANSLATE) -m $< -p po4a/$(@:.dbk=.po) -l $@ # -a ?po4a/$(@:.dbk=.add)
+#      $(TRANSLATE) -m $< -p po4a/$(@:.dbk=.po) -l $@ -a ?po4a/$(@:.dbk=.add)
+# workaround to "-a ?" only possible with po4a version in Squeeze, otherwise build is broken in Lenny
+       if [ -f po4a/$(@:.dbk=.add) ]; then \
+               $(TRANSLATE) -m $< -p po4a/$(@:.dbk=.po) -l $@ -a po4a/$(@:.dbk=.add); else \
+               $(TRANSLATE) -m $< -p po4a/$(@:.dbk=.po) -l $@; fi
 
 $(LINGUA)/common.ent:  common.ent
        cd $(@D) && ln -sf ../$(@F) .

diff --git a/debian/changelog b/debian/changelog
index 6e94b7a51975ece213cec25bf86bf60c251a7ec0..9e89951026a829131f790f1bbd1ff85d4fd154ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,8 +57,9 @@ developers-reference (3.4.4) unstable; urgency=low
   * Apply updated patch from Nicolas François. Closes: #257150
   * dinstall run happens four times a day. Closes: #585161
   * Activate Japanese package.
+  * Handle addendum if it exists.
 
- -- Raphaël Hertzog <hertzog@debian.org>  Mon, 22 Nov 2010 19:02:14 -0400
+ -- Raphaël Hertzog <hertzog@debian.org>  Mon, 22 Nov 2010 19:28:03 -0400
 
 developers-reference (3.4.3) unstable; urgency=low