# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1235296319 0
# Node ID 51c1d11cbde9422a872db8601a9bbc0ca331e5ec
# Parent  d3524090d5e23154ac33c51f2118002a803aa2f5# Parent  97070bd10b98d12ba3ceb35dcfd042015f8c4639
Merge

diff -r d3524090d5e2 -r 51c1d11cbde9 CMakeLists.txt
--- a/CMakeLists.txt	Fri Feb 20 20:51:11 2009 +0000
+++ b/CMakeLists.txt	Sun Feb 22 09:51:59 2009 +0000
@@ -87,7 +87,7 @@
   SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lemon.cs.elte.hu")
   SET(CPACK_NSIS_CONTACT "lemon-user@lemon.cs.elte.hu")
   SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
-    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\doc\\\\index.html\\\"
+    CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Documentation.lnk\\\" \\\"$INSTDIR\\\\share\\\\doc\\\\index.html\\\"
     ")
   SET(CPACK_NSIS_DELETE_ICONS_EXTRA "
     !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
diff -r d3524090d5e2 -r 51c1d11cbde9 cmake/FindGhostscript.cmake
--- a/cmake/FindGhostscript.cmake	Fri Feb 20 20:51:11 2009 +0000
+++ b/cmake/FindGhostscript.cmake	Sun Feb 22 09:51:59 2009 +0000
@@ -3,7 +3,7 @@
 FIND_PROGRAM(GHOSTSCRIPT_EXECUTABLE
   NAMES gs gswin32c
   PATHS "$ENV{ProgramFiles}/gs"
-  PATH_SUFFIXES gs8.61/bin gs8.62/bin
+  PATH_SUFFIXES gs8.61/bin gs8.62/bin gs8.63/bin gs8.64/bin gs8.65/bin
   DOC "Ghostscript: PostScript and PDF language interpreter and previewer."
 )
 
diff -r d3524090d5e2 -r 51c1d11cbde9 doc/CMakeLists.txt
--- a/doc/CMakeLists.txt	Fri Feb 20 20:51:11 2009 +0000
+++ b/doc/CMakeLists.txt	Sun Feb 22 09:51:59 2009 +0000
@@ -37,6 +37,6 @@
   ENDIF(UNIX)
   INSTALL(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
-    DESTINATION doc
+    DESTINATION share/doc
     COMPONENT html_documentation)
 ENDIF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)