Merge branch 'feature/fix-rpm-on-arm-6100' into next

Fixes #6100
This commit is contained in:
Michael Friedrich 2014-05-01 16:41:46 +02:00
commit 5e094ed185
2 changed files with 16 additions and 5 deletions

View File

@ -15,9 +15,9 @@
# along with this program; if not, write to the Free Software Foundation
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
if(UNIX OR CYGWIN)
file(GLOB DOCSRCS "*.md")
file(GLOB DOCSRCS "*.md")
if(UNIX OR CYGWIN)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/htdocs/index.html
COMMAND ./mkdoc.sh
@ -38,3 +38,17 @@ if(UNIX OR CYGWIN)
DESTINATION ${CMAKE_INSTALL_MANDIR}/man8
)
endif()
# pandoc is not available or working everywhere, so install the unprocessed markdown files too
install(
FILES ${DOCSRCS}
DESTINATION ${CMAKE_INSTALL_DOCDIR}/markdown
)
if(UNIX OR CYGWIN)
# maybe someone wants to process his own doc files after installing current pandoc/sphinx
install(
FILES conf.py mkdoc.sh
DESTINATION ${CMAKE_INSTALL_DOCDIR}/markdown
)
endif()

View File

@ -74,8 +74,6 @@ Summary: Icinga 2 binaries and libraries
Group: Applications/System
BuildRequires: doxygen
BuildRequires: pandoc
BuildRequires: python-sphinx
BuildRequires: openssl-devel
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
@ -460,7 +458,6 @@ exit 0
%files doc
%defattr(-,root,root,-)
%doc COPYING COPYING.Exceptions README NEWS AUTHORS ChangeLog
%{_datadir}/doc/%{name}
%docdir %{_datadir}/doc/%{name}