apt-pkg/packagemanager.cc: tweak MaxLoopCount to 500 and improve the error message

[apt.git] / doc / makefile

diff --git a/doc/makefile b/doc/makefile
index 93504e23eafbce4bc999371dc15ca21f1c7fb7f9..df2ddb25f37fc582643f230e9f1bd15c250b6f19 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -15,7 +15,7 @@ include $(DEBIANDOC_H)
 ifdef XSLTPROC
 # generate a list of accepted man page translations
 SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
-INCLUDES = apt.ent
+INCLUDES = apt.ent apt-verbatim.ent
 STYLESHEET=manpage-style.xsl
 
 LOCAL := manpage-$(firstword $(SOURCE))
@@ -51,10 +51,7 @@ doc:
        for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \
                test -d $$i || mkdir $$i; \
                test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \
-       done
-       # it is likely that we have changed the list, so SUBDIRS is incorrect
-       for dir in $(dir $(wildcard */makefile)); do\
-               $(MAKE) -C $$dir $@; \
+               $(MAKE) -C $$i $@; \
        done
 
 clean: clean-subdirs
@@ -67,29 +64,24 @@ clean-subdirs:
 
 veryclean-subdirs:
        for dir in $(SUBDIRS); do\
-               $(MAKE) -C $$dir veryclean; \
+               rm -rf $$dir; \
        done
 
+.PHONY: update-po po4a stats
+
 ifdef PO4A
 doc: po4a
 
-clean: po4a-clean
-
-.PHONY: update-po po4a stats
 update-po:
        po4a --previous --no-backups --force --no-translations po4a.conf
 
-po4a-clean:
-       po4a --previous --rm-backups --rm-translations po4a.conf
-
 po4a:
        po4a --previous --no-backups po4a.conf
+endif
 
 stats:
        for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
-endif
-
 ifdef DOXYGEN
 DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )
 
@@ -99,11 +91,9 @@ doxygen-clean:
        rm -fr $(BUILD)/doc/doxygen
        rm -f $(BUILD)/doc/doxygen-stamp
 
-$(BUILD)/doc/Doxyfile: Doxyfile.in
-       (cd $(BUILD) && ./config.status doc/Doxyfile)
-
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
        rm -fr $(BUILD)/doc/doxygen
+       mkdir $(BUILD)/doc/doxygen  # some versions seem to not create this directory #628799
        $(DOXYGEN) $(BUILD)/doc/Doxyfile
        touch $(BUILD)/doc/doxygen-stamp