diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-11 11:55:00 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-09-08 16:17:08 +0200 |
| commit | 70d9f1f7a5fd32043c4995fafeeab225826d5191 (patch) | |
| tree | a54e57d8f55b33c4e22dedd49ba466364bb45286 | |
| parent | 487ffd097a9151831bf804856b6e2cb77a830ef0 (diff) | |
| download | tdesvn-70d9f1f7a5fd32043c4995fafeeab225826d5191.tar.gz tdesvn-70d9f1f7a5fd32043c4995fafeeab225826d5191.zip | |
Update HTML install path references.
(cherry picked from commit 66ead5336cf934245eb8e12583f0643c560e1a3d)
| -rw-r--r-- | cmakemodules/FindKdeLibs.cmake | 2 | ||||
| -rw-r--r-- | doc/makelink.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmakemodules/FindKdeLibs.cmake b/cmakemodules/FindKdeLibs.cmake index 865f582..796304a 100644 --- a/cmakemodules/FindKdeLibs.cmake +++ b/cmakemodules/FindKdeLibs.cmake @@ -417,7 +417,7 @@ set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity" CA set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix" FORCE) set(CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" CACHE PATH "The config file install dir" FORCE) set(DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" CACHE PATH "The parent directory where applications can install their data" FORCE) -set(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" CACHE PATH "The HTML install dir for documentation" FORCE) +set(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/tde/HTML" CACHE PATH "The HTML install dir for documentation" FORCE) set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" CACHE PATH "The icon install dir (default prefix/share/icons/)" FORCE) set(KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" CACHE PATH "The install dir for kconfig files" FORCE) set(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" CACHE PATH "The install dir for translations" FORCE) diff --git a/doc/makelink.cmake b/doc/makelink.cmake index 3c64ed4..fe041c8 100644 --- a/doc/makelink.cmake +++ b/doc/makelink.cmake @@ -4,15 +4,15 @@ ELSE($ENV{DESTDIR} MATCHES ".+") SET(DESTDIR "") ENDIF($ENV{DESTDIR} MATCHES ".+") -SET(COMMONLINK "${DESTDIR}${CMAKE_INSTALL_PREFIX}/share/doc/HTML/en/kdesvn/common") +SET(COMMONLINK "${DESTDIR}${CMAKE_INSTALL_PREFIX}/share/doc/tde/HTML/en/kdesvn/common") MESSAGE(STATUS "Generating ${COMMONLINK}") EXECUTE_PROCESS( COMMAND "rm" "-f" "common" COMMAND ln "-s" "../common" "common" - WORKING_DIRECTORY "${DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/doc/HTML/en/kdesvn" + WORKING_DIRECTORY "${DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/doc/tde/HTML/en/kdesvn" ) -SET(CMAKE_INSTALL_MANIFEST_FILES ${CMAKE_INSTALL_MANIFEST_FILES} "${CMAKE_INSTALL_PREFIX}/share/doc/HTML/en/kdesvn/common") +SET(CMAKE_INSTALL_MANIFEST_FILES ${CMAKE_INSTALL_MANIFEST_FILES} "${CMAKE_INSTALL_PREFIX}/share/doc/tde/HTML/en/kdesvn/common") |