Files

Merge lp:~mefrio-g/pantheon-files/plugin-fix into lp:~elementary-apps/pantheon-files/trunk

  1. plugin-fix
  2. Merge into trunk
Proposed by Mario Guerriero
Status: Merged
Merged at revision: 834
Proposed branch: lp:~mefrio-g/pantheon-files/plugin-fix
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 39 lines (+8/-8)
3 files modified
plugins/extended-actions/CMakeLists.txt (+2/-2)
plugins/marlin-ctags/CMakeLists.txt (+3/-3)
plugins/marlin-trash/CMakeLists.txt (+3/-3)
To merge this branch: bzr merge lp:~mefrio-g/pantheon-files/plugin-fix
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+107925@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/extended-actions/CMakeLists.txt'
2--- plugins/extended-actions/CMakeLists.txt 2011-12-04 12:05:59 +0000
3+++ plugins/extended-actions/CMakeLists.txt 2012-05-30 07:57:18 +0000
4@@ -24,5 +24,5 @@
5 add_library(marlin-extended-actions SHARED
6 ${VALA_C})
7 target_link_libraries(marlin-extended-actions marlincore marlinwidgets)
8-install(TARGETS marlin-extended-actions DESTINATION lib/marlin/plugins/core/)
9-install(FILES extended-actions.plug DESTINATION lib/marlin/plugins/core/)
10+install(TARGETS marlin-extended-actions DESTINATION lib/pantheon-files/plugins/core/)
11+install(FILES extended-actions.plug DESTINATION lib/pantheon-files/plugins/core/)
12
13=== modified file 'plugins/marlin-ctags/CMakeLists.txt'
14--- plugins/marlin-ctags/CMakeLists.txt 2012-01-02 15:55:50 +0000
15+++ plugins/marlin-ctags/CMakeLists.txt 2012-05-30 07:57:18 +0000
16@@ -35,6 +35,6 @@
17 add_library(marlinctags SHARED
18 ${VALA_C})
19 target_link_libraries(marlinctags ${DEPS_LIBRARIES} marlincore)
20-install(TARGETS marlinctags DESTINATION lib/marlin/plugins/core/)
21-install(FILES marlinctags.plug DESTINATION lib/marlin/plugins/core/)
22-include_directories(${CMAKE_BINARY_DIR}/marlinplugins/)
23+install(TARGETS marlinctags DESTINATION lib/pantheon-files/plugins/core/)
24+install(FILES marlinctags.plug DESTINATION lib/pantheon-files/plugins/core/)
25+include_directories(${CMAKE_BINARY_DIR}/plugins/)
26
27=== modified file 'plugins/marlin-trash/CMakeLists.txt'
28--- plugins/marlin-trash/CMakeLists.txt 2011-11-18 05:40:30 +0000
29+++ plugins/marlin-trash/CMakeLists.txt 2012-05-30 07:57:18 +0000
30@@ -33,6 +33,6 @@
31 add_library(marlintrash SHARED
32 ${VALA_C})
33 target_link_libraries(marlintrash ${DEPS_LIBRARIES} marlincore)
34-install(TARGETS marlintrash DESTINATION lib/marlin/plugins/core/)
35-install(FILES marlintrash.plug DESTINATION lib/marlin/plugins/core/)
36-include_directories(${CMAKE_BINARY_DIR}/marlinplugins/)
37+install(TARGETS marlintrash DESTINATION lib/pantheon-files/plugins/core/)
38+install(FILES marlintrash.plug DESTINATION lib/pantheon-files/plugins/core/)
39+include_directories(${CMAKE_BINARY_DIR}/plugins/)

Subscribers

People subscribed via source and target branches

to all changes: