blob: 6e7db28fe99a86d3004a18ce881ecdff4a466745 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
diff -Naur Sigil-0.9.4/internal/gumbo/CMakeLists.txt Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt
--- Sigil-0.9.4/internal/gumbo/CMakeLists.txt 2016-03-13 20:20:52.000000000 +0100
+++ Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt 2016-03-22 14:50:26.026558216 +0100
@@ -40,4 +40,5 @@
if( UNIX AND NOT APPLE )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
+ install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
endif()
diff -Naur Sigil-0.9.4/src/CMakeLists.txt Sigil-0.9.4.b/src/CMakeLists.txt
--- Sigil-0.9.4/src/CMakeLists.txt 2016-03-13 20:20:52.000000000 +0100
+++ Sigil-0.9.4.b/src/CMakeLists.txt 2016-03-22 14:49:49.628556236 +0100
@@ -1015,12 +1015,10 @@
endif()
# Standard Linux 'make install'
- install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+ install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
- install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
endif()
- install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
install( FILES ${LINUX_DESKTOP_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/applications/ )
install( FILES ${LINUX_DESKTOP_ICON_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/pixmaps RENAME sigil.png )
install( FILES ${QM_FILES} DESTINATION ${SIGIL_SHARE_ROOT}/translations/ )
|
GitWeb
