Correct po4a option handling.

diff --git a/Makefile b/Makefile
index 3e55d9509eb48536e9dda8e38c7e264a29677f5a..e44cf80891879fad0c4d1256cca9913ca650346c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,12 +52,14 @@ $(SOURCE).md: $(SOURCE).odt fixup.rb
        rm $$TEMP
 
 pot: po/mwcc.pot po/*/mwcc.po
+PO4AOPTS =  \
+       -o nodefault="<imageobject> <copyright> <publisher> <address> <city>" \
+       -o untranslated="<imageobject>" \
+       -o translated='<copyright> <publisher><publisername> <publisher><address><city>' 
 po/mwcc.pot: $(SOURCE).xml
        TEMP=`tempfile -p mwcc` && \
        po4a-gettextize -f docbook -m $(SOURCE).xml -p $$TEMP -M utf-8 \
-               -o nodefault="<imageobject> <copyright> <publisher> <address> <city>" \
-               -o untranslated="<imageobject>" \
-               -o translated='<copyright> <publisher><publisername> <publisher><address><city>' \
+               $(PO4AOPTS) \
                --package-name 'Made with Creative Commons' \
                --package-version $(VERSION) && \
        echo '# MADE WITH CREATIVE COMMONS' > $@ && \
@@ -72,22 +74,22 @@ po/*/mwcc.po: po/mwcc.pot
        touch $@
 
 $(SOURCE).de.xml: $(SOURCE).xml po/de/mwcc.po
-       po4a-translate -f docbook -m $(SOURCE).xml -p po/de/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 -k 0
+       po4a-translate -f docbook -m $(SOURCE).xml -p po/de/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 $(PO4AOPTS) -k 0
 
 $(SOURCE).es.xml: $(SOURCE).xml po/es/mwcc.po
-       po4a-translate -f docbook -m $(SOURCE).xml -p po/es/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 -k 0
+       po4a-translate -f docbook -m $(SOURCE).xml -p po/es/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 $(PO4AOPTS) -k 0
 
 $(SOURCE).nb.xml: $(SOURCE).xml po/nb/mwcc.po
-       po4a-translate -f docbook -m $(SOURCE).xml -p po/nb/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 -k 0
+       po4a-translate -f docbook -m $(SOURCE).xml -p po/nb/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 $(PO4AOPTS) -k 0
 
 $(SOURCE).nl.xml: $(SOURCE).xml po/nl/mwcc.po
-       po4a-translate -f docbook -m $(SOURCE).xml -p po/nl/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 -k 0
+       po4a-translate -f docbook -m $(SOURCE).xml -p po/nl/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 $(PO4AOPTS) -k 0
 
 $(SOURCE).pl.xml: $(SOURCE).xml po/pl/mwcc.po
-       po4a-translate -f docbook -m $(SOURCE).xml -p po/pl/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 -k 0
+       po4a-translate -f docbook -m $(SOURCE).xml -p po/pl/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 $(PO4AOPTS) -k 0
 
 $(SOURCE).uk.xml: $(SOURCE).xml po/uk/mwcc.po
-       po4a-translate -f docbook -m $(SOURCE).xml -p po/uk/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 -k 0
+       po4a-translate -f docbook -m $(SOURCE).xml -p po/uk/mwcc.po -l $@ -l $@ -L utf-8 -M utf-8 $(PO4AOPTS) -k 0
 
 $(SOURCE).xml: $(SOURCE).md fixup-docbook.rb
        TEMP=`tempfile -p mwcc` && \