From c7f665504304cc1c0c7cc11a1c1193ed0998f5e8 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 24 Nov 2017 09:29:46 +0100 Subject: [PATCH] fix doxygen doc build * debian/rules: Build it last. * configure.ac: Add missing comma. --- configure.ac | 2 +- debian/rules | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7b18fd0d2..843effce7 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ AC_ARG_ENABLE([c++17], AC_ARG_ENABLE([doxygen], [AC_HELP_STRING([--enable-doxygen]), - [enable generation of Doxygen documentation (requires Doxygen)])] + [enable generation of Doxygen documentation (requires Doxygen)])], [enable_doxygen=yes], [enable_doxygen=no]) AM_CONDITIONAL([ENABLE_DOXYGEN], [test "x${enable_doxygen:-no}" = xyes]) diff --git a/debian/rules b/debian/rules index e9afe2f9d..78084f705 100755 --- a/debian/rules +++ b/debian/rules @@ -65,8 +65,7 @@ override_dh_auto_configure: make clean dh_auto_configure -- $(PRO2SETUP) $(LTOSETUP) \ --disable-devel --enable-optimizations \ - --disable-static --enable-doxygen \ - PYTHON=/usr/bin/$(PYDEFAULT) + --disable-static PYTHON=/usr/bin/$(PYDEFAULT) $(FLTOWORKAROUND) override_dh_auto_install: fix-js dh_auto_install --destdir=$(CURDIR)/debian/tmp @@ -84,9 +83,12 @@ override_dh_auto_install: fix-js # alongside dynamic libraries, otherwise they will be stuffed with # LTO stuff that is just two big to distribute. And we cannot use # the profile generated with LTO on, so we simply build without it. +# +# Since this is a last rebuild, we also construct the Doxygen doc. dh_auto_configure -- \ --disable-devel --enable-optimizations \ - --disable-shared --enable-static --disable-python + --disable-shared --enable-static --disable-python \ + --enable-doxygen dh_auto_build -- clean dh_auto_build -- all dh_auto_install -- -C buddy