Further Doxygen documentation fixes

* Fix another Doxygen call to generate a configuration file, and remove
  the generated configuration files after Doxygen runs.

diff --git a/debian/changelog b/debian/changelog
index 983fddb3c0d23c06bf4c6edc61f46b49707cc9a0..953a23f608b41c5c425954e6ba6c04b960a65c75 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.6.0~pre7-3) UNRELEASED; urgency=low
+
+  * Fix another Doxygen call to generate a configuration file, and remove
+    the generated configuration files after Doxygen runs.
+
+ -- Russ Allbery <rra@debian.org>  Sun, 24 Jul 2011 17:30:26 -0700
+
 openafs (1.6.0~pre7-2) unstable; urgency=low
 
   * Force use of dblatex to build the manual, even if docbook2pdf is

diff --git a/debian/rules b/debian/rules
index 0109fc3781291798a43d7fc753ca48c74fb151d4..9f889889b610f615dbfdcd4d07c25e6ac63a5897 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -159,13 +159,13 @@ override_dh_install:
        cp doc/xml/AdminGuide/*.png $(DOCS)/html/AdminGuide/
        mkdir $(DOCS)/html/arch-overview
        cp doc/arch/arch-overview.h $(DOCS)/html/arch-overview
-       cd $(DOCS)/html/arch-overview && doxygen *.h && rm *.h && mv html/* . \
-           && rm -r latex html
+       cd $(DOCS)/html/arch-overview && doxygen -g && doxygen \
+           && rm Doxyfile *.h && mv html/* . && rm -r latex html
        set -e; for h in doc/protocol/*.h ; do \
            mkdir $(DOCS)/html/`basename $$h .h` ; \
            cp $$h $(DOCS)/html/`basename $$h .h` ; \
            cd $(DOCS)/html/`basename $$h .h` && doxygen -g && doxygen \
-               && rm *.h && mv html/* . && rm -r latex html \
+               && rm Doxyfile *.h && mv html/* . && rm -r latex html \
                && cd $(CURDIR) ; \
        done