Revised sandbox patch.

0.7_p1188-sandbox.patch (text/plain), 1.56 KB, created by Clemmitt M. Sigler on 2010-01-08 16:33:55 UTC

diff -ur canorus-0.7.R1002.orig/CMakeLists.txt canorus-0.7.R1002/CMakeLists.txt
--- canorus-0.7.R1002.orig/CMakeLists.txt	2009-03-27 12:27:02.000000000 +0200
+++ canorus-0.7.R1002/CMakeLists.txt	2009-08-29 14:07:19.000000000 +0300
@@ -68,7 +68,7 @@
 	ENDIF (NOT CMAKE_INSTALL_PREFIX)
 	SET(CANORUS_INSTALL_DATA_DIR "share/canorus")
 	SET(CANORUS_INSTALL_BIN_DIR "bin")
-	SET(CANORUS_INSTALL_LIB_DIR "lib")
+	SET(CANORUS_INSTALL_LIB_DIR "lib${LIB_SUFFIX}")
 ENDIF(APPLE)
 ENDIF(MINGW)
 
diff -ur canorus-0.7.R1002.orig/src/CMakeLists.txt canorus-0.7.R1002/src/CMakeLists.txt
--- canorus-0.7.R1002.orig/src/CMakeLists.txt	2009-03-27 12:25:52.000000000 +0200
+++ canorus-0.7.R1002/src/CMakeLists.txt	2009-08-29 14:06:43.000000000 +0300
@@ -688,8 +688,8 @@
 # Install fonts
 INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
 # Install users manual, if it exists
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
 FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
 INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
# Install examples