factor out parsing of MultiArch flag

[apt.git] / buildlib / debiandoc.mak

diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak
index 5e08bda6c360df4884c3c68af12c2197bb27f14d..7e22467cf0c285814f8495f8824b37f4fb20d05b 100644 (file)
--- a/buildlib/debiandoc.mak
+++ b/buildlib/debiandoc.mak
@@ -14,20 +14,22 @@ LOCAL := debiandoc-$(firstword $(SOURCE))
 $(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE))))
 $(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE))))
 
+debiandoc:
+
 #---------
 
 # Rules to build HTML documentations
 ifdef DEBIANDOC_HTML
 
 # Install generation hooks
-doc: $($(LOCAL)-HTML)
+debiandoc: $($(LOCAL)-HTML)
 veryclean: veryclean/html/$(LOCAL)
 
 vpath %.sgml $(SUBDIRS)
 $(DOC)/%.html: %.sgml
        echo Creating html for $< to $@
        -rm -rf $@
-       (HERE=`pwd`; cd $(@D) && debiandoc2html $$HERE/$<)
+       (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<) || exit 199
 
 # Clean rule
 .PHONY: veryclean/html/$(LOCAL)
@@ -42,13 +44,13 @@ endif
 ifdef DEBIANDOC_TEXT
 
 # Install generation hooks
-doc: $($(LOCAL)-TEXT)
+debiandoc: $($(LOCAL)-TEXT)
 veryclean: veryclean/text/$(LOCAL)
 
 vpath %.sgml $(SUBDIRS)
 $(DOC)/%.text: %.sgml
        echo Creating text for $< to $@
-       debiandoc2text -O $< > $@
+       $(DEBIANDOC_TEXT) -O $< > $@ || exit 198
 
 # Clean rule
 .PHONY: veryclean/text/$(LOCAL)