Files

Merge lp:~donadigo/pantheon-files/fix-1467060 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1467060
  2. Merge into trunk
Proposed by Adam Bieńkowski
Status: Merged
Approved by: xapantu
Approved revision: 1871
Merged at revision: 1871
Proposed branch: lp:~donadigo/pantheon-files/fix-1467060
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 18 lines (+2/-2)
1 file modified
filechooser-module/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~donadigo/pantheon-files/fix-1467060
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+263200@code.launchpad.net

This proposal supersedes a proposal from 2015-06-28.

Commit message

Fix for hardcoded module path: #1467060

Description of the change

Fix for hardcoded module path: https://bugs.launchpad.net/pantheon-files/+bug/1467060 (applied patch).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'filechooser-module/CMakeLists.txt'
2--- filechooser-module/CMakeLists.txt 2015-06-28 12:58:16 +0000
3+++ filechooser-module/CMakeLists.txt 2015-06-28 17:12:08 +0000
4@@ -5,7 +5,7 @@
5 add_definitions (${DEPS_CFLAGS})
6 link_directories (${DEPS_LIBRARY_DIRS})
7 set (MODULE_NAME "pantheon-filechooser-module")
8-set (MOULDE_LIBDIR "${CMAKE_INSTALL_LIBDIR}/gtk-3.0/modules/")
9+set (MODULE_LIBDIR "${CMAKE_INSTALL_LIBDIR}/gtk-3.0/modules/")
10
11 vala_precompile (VALA_C ${MODULE_NAME}
12 ${CMAKE_SOURCE_DIR}/libwidgets/LocationBar.vala
13@@ -27,4 +27,4 @@
14 target_link_libraries (${MODULE_NAME} ${DEPS_LIBRARIES} gthread-2.0)
15
16 # Installation
17-install (TARGETS ${MODULE_NAME} DESTINATION "${MOULDE_LIBDIR}")
18+install (TARGETS ${MODULE_NAME} DESTINATION "${MODULE_LIBDIR}")

Subscribers

People subscribed via source and target branches

to all changes: