From 409d6dc5f41cd7ac0e713e3f4c1e3221732b1c14 Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Tue, 24 Apr 2012 16:18:21 +0400
Subject: [PATCH] bug837484: rpm doc installation case added
---
doc/developer/CMakeLists.txt | 11 ++++++++---
doc/user/CMakeLists.txt | 11 ++++++++---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/doc/developer/CMakeLists.txt b/doc/developer/CMakeLists.txt
index 30a0137d0a..27b46c91eb 100644
--- a/doc/developer/CMakeLists.txt
+++ b/doc/developer/CMakeLists.txt
@@ -3,7 +3,7 @@ set(PATH_DEVGUIDE_HTML "${PROJECT_BINARY_DIR}/doc/www-data/tarantool_developer_g
set(PATH_DEVGUIDE_TXT "${PROJECT_BINARY_DIR}/doc/developer/tarantool_developer_guide.txt")
if (NOT JING STREQUAL "JING-NOTFOUND")
- add_custom_target(dev-check ALL
+ add_custom_target(doc-check-dev ALL
COMMAND ${JING} http://docbook.org/xml/5.0/rng/docbookxi.rng developer.xml)
endif()
@@ -25,6 +25,11 @@ if (NOT XSLTPROC STREQUAL "XSLTPROC-NOTFOUND" AND
NOT LYNX STREQUAL "LYNX-NOTFOUND")
add_custom_target(doc-autogen-dev ALL
DEPENDS ${PATH_DEVGUIDE_HTML} ${PATH_DEVGUIDE_TXT})
- install (FILES ${PATH_DEVGUIDE_HTML}
- ${PATH_DEVGUIDE_TXT} DESTINATION share/doc/tarantool)
+ if ("${CPACK_GENERATOR}" STREQUAL "RPM")
+ install (FILES ${PATH_DEVGUIDE_HTML}
+ ${PATH_DEVGUIDE_TXT} DESTINATION /usr/local/doc/tarantool)
+ else()
+ install (FILES ${PATH_DEVGUIDE_HTML}
+ ${PATH_DEVGUIDE_TXT} DESTINATION share/doc/tarantool)
+ endif()
endif()
diff --git a/doc/user/CMakeLists.txt b/doc/user/CMakeLists.txt
index 88573658b6..e381196aa9 100644
--- a/doc/user/CMakeLists.txt
+++ b/doc/user/CMakeLists.txt
@@ -11,7 +11,7 @@ set(PATH_USERGUIDE_TXT "${PROJECT_BINARY_DIR}/doc/user/tarantool_user_guide.txt"
# jing http://docbook.org/xml/5.0/rng/docbookxi.rng file.xml
#
if (NOT XMLLINT STREQUAL "XMLLINT-NOTFOUND")
- add_custom_target(check ALL
+ add_custom_target(doc-check ALL
COMMAND ${XMLLINT} --xinclude --noout --relaxng http://docbook.org/xml/5.0/rng/docbookxi.rng user.xml)
endif()
@@ -36,8 +36,13 @@ if (NOT XSLTPROC STREQUAL "XSLTPROC-NOTFOUND" AND
NOT LYNX STREQUAL "LYNX-NOTFOUND")
add_custom_target(doc-autogen ALL
DEPENDS ${PATH_USERGUIDE_HTML} ${PATH_USERGUIDE_TXT})
- install (FILES ${PATH_USERGUIDE_HTML}
- ${PATH_USERGUIDE_TXT} DESTINATION share/doc/tarantool)
+ if ("${CPACK_GENERATOR}" STREQUAL "RPM")
+ install (FILES ${PATH_USERGUIDE_HTML}
+ ${PATH_USERGUIDE_TXT} DESTINATION /usr/local/doc/tarantool)
+ else()
+ install (FILES ${PATH_USERGUIDE_HTML}
+ ${PATH_USERGUIDE_TXT} DESTINATION share/doc/tarantool)
+ endif()
endif()
add_custom_target(pdf
--
GitLab