From: taffit-guest <taffit-guest@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Mon, 22 Nov 2010 23:34:24 +0000 (+0000)
Subject: Handle addendum if it exists
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=9d31b5b707ce47c530ae6825348f7070e40930b4

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 8dac6d1..6aed88f 100644
--- 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 6e94b7a..9e89951 100644
--- 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