From 1e79705628af79b2cf6f87a67268f8202774bb9b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Wed, 13 Jan 2016 13:50:34 +0100 Subject: Build the doc with the default make target --- CMakeLists.txt | 3 ++- packaging/biboumi.spec | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ff7be6..3683c39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ if(RONN_EXECUTABLE) add_custom_command(OUTPUT ${MAN_PAGE} COMMAND ${RONN_EXECUTABLE} --roff < ${DOC_PAGE} > ${MAN_PAGE} DEPENDS ${DOC_PAGE}) - add_custom_target(doc DEPENDS ${MAN_PAGE}) + add_custom_target(doc ALL DEPENDS ${MAN_PAGE}) endif() # Look for litesql and enable the database if found @@ -124,6 +124,7 @@ target_link_libraries(xmpp xmpplib bridge network utils logger) if(USE_DATABASE) target_link_libraries(xmpp database) + target_link_libraries(irc database) endif() # diff --git a/packaging/biboumi.spec b/packaging/biboumi.spec index e375504..ce57800 100644 --- a/packaging/biboumi.spec +++ b/packaging/biboumi.spec @@ -39,11 +39,10 @@ cmake . -DCMAKE_CXX_FLAGS="%{optflags}" \ -DWITH_SYSTEMD=1 \ -DWITH_LIBIDN=1 -make %{?_smp_mflags} - # The documentation is in utf-8, ronn fails to build it if that locale is # not specified -LC_ALL=en_GB.utf-8 make doc +export LC_ALL=en_GB.utf-8 +make %{?_smp_mflags} %install -- cgit v1.2.3