Merge lp:~thomir-deactivatedaccount/mir/fix-doc-install-path into lp:~mir-team/mir/trunk

[Thomi Richards]

mir-doc package now installs documentation to /usr/share/doc/mir-doc/

This branch fixes the install path in the mir-doc package to conform to debian packaging policy.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/mir-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/46//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/45//rebuild/?

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

That looks right. The html/ tree is now under /usr/share/doc/mir-doc/.

review: Approve

[Michael Terry (mterry)]

This looks good to me now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:472
http://jenkins.qa.ubuntu.com/job/mir-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/48//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/47//rebuild/?

review: Approve (continuous-integration)

=== modified file 'cmake/Doxygen.cmake'
--- cmake/Doxygen.cmake	2013-03-11 10:10:12 +0000
+++ cmake/Doxygen.cmake	2013-03-11 22:18:20 +0000
@@ -17,5 +17,5 @@
   add_custom_target(doc ${ALL}
                     COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile
                     SOURCES ${PROJECT_BINARY_DIR}/Doxyfile)
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PATH}/share/doc/mir-doc/)
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc/)
 endif()

=== modified file 'debian/mir-doc.install'
--- debian/mir-doc.install	2013-03-08 05:01:04 +0000
+++ debian/mir-doc.install	2013-03-11 22:18:20 +0000
@@ -1,1 +1,1 @@
-share/doc/mir-doc/
+usr/share/doc/mir-doc/