Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Sun, 22 Feb 2009 09:52:44 +0000
changeset 5188668e1b5dafb
parent 517 2b6d5d22bb23
parent 500 97070bd10b98
child 519 c786cd201266
Merge
CMakeLists.txt
doc/CMakeLists.txt
     1.1 --- a/CMakeLists.txt	Fri Feb 20 21:37:19 2009 +0000
     1.2 +++ b/CMakeLists.txt	Sun Feb 22 09:52:44 2009 +0000
     1.3 @@ -96,7 +96,7 @@
     1.4    SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
     1.5    SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
     1.6    SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
     1.7 -    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
     1.8 +    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
     1.9      ")
    1.10    SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
    1.11      !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
     2.1 --- a/cmake/FindGhostscript.cmake	Fri Feb 20 21:37:19 2009 +0000
     2.2 +++ b/cmake/FindGhostscript.cmake	Sun Feb 22 09:52:44 2009 +0000
     2.3 @@ -3,7 +3,7 @@
     2.4  FIND_PROGRAM(GHOSTSCRIPT_EXECUTABLE
     2.5    NAMES gs gswin32c
     2.6    PATHS "$ENV{ProgramFiles}/gs"
     2.7 -  PATH_SUFFIXES gs8.61/bin gs8.62/bin
     2.8 +  PATH_SUFFIXES gs8.61/bin gs8.62/bin gs8.63/bin gs8.64/bin gs8.65/bin
     2.9    DOC "Ghostscript: PostScript and PDF language interpreter and previewer."
    2.10  )
    2.11  
     3.1 --- a/doc/CMakeLists.txt	Fri Feb 20 21:37:19 2009 +0000
     3.2 +++ b/doc/CMakeLists.txt	Sun Feb 22 09:52:44 2009 +0000
     3.3 @@ -38,6 +38,6 @@
     3.4    ENDIF(UNIX)
     3.5    INSTALL(
     3.6      DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
     3.7 -    DESTINATION doc
     3.8 +    DESTINATION share/doc
     3.9      COMPONENT html_documentation)
    3.10  ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)