Files

Merge lp:~xapantu/pantheon-files/trunk into lp:~elementary-apps/pantheon-files/trunk

  1. trunk
  2. Merge into trunk
Proposed by xapantu
Status: Rejected
Rejected by: xapantu
Proposed branch: lp:~xapantu/pantheon-files/trunk
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 17 lines (+1/-2)
1 file modified
filechooser-module/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~xapantu/pantheon-files/trunk
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+263199@code.launchpad.net

Description of the change

Without this, I doubt it will work on 32 bits system… (and it does not on archlinux, where that path is not used).

To post a comment you must log in.

Unmerged revisions

1870. By xapantu

Fix gtk module path

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-05-13 19:20:15 +0000
3+++ filechooser-module/CMakeLists.txt 2015-06-28 14:06:33 +0000
4@@ -4,7 +4,6 @@
5 add_definitions (${DEPS_CFLAGS})
6 link_directories (${DEPS_LIBRARY_DIRS})
7 set (MODULE_NAME "pantheon-filechooser-module")
8-set (MOULDE_LIBDIR "/usr/lib/x86_64-linux-gnu")
9
10 vala_precompile (VALA_C ${MODULE_NAME}
11 ${CMAKE_SOURCE_DIR}/libwidgets/LocationBar.vala
12@@ -26,4 +25,4 @@
13 target_link_libraries (${MODULE_NAME} ${DEPS_LIBRARIES} gthread-2.0)
14
15 # Installation
16-install (TARGETS ${MODULE_NAME} DESTINATION "${MOULDE_LIBDIR}/gtk-3.0/modules/")
17+install (TARGETS ${MODULE_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}/gtk-3.0/modules/")

Subscribers

People subscribed via source and target branches

to all changes: