unity-scope-click

Merge lp:~dobey/unity-scope-click/fix-rpath into lp:unity-scope-click

  1. fix-rpath
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 93
Merged at revision: 94
Proposed branch: lp:~dobey/unity-scope-click/fix-rpath
Merge into: lp:unity-scope-click
Diff against target: 12 lines (+1/-1)
1 file modified
src/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/fix-rpath
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Mike McCracken (community) Approve
Review via email: mp+199535@code.launchpad.net

Commit message

Use $PROTOCOLPRIVATELIBDIR as $libdir may not be set to same path during build.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

works

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/131/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Makefile.am'
2--- src/Makefile.am 2013-12-17 17:30:12 +0000
3+++ src/Makefile.am 2013-12-18 19:20:21 +0000
4@@ -61,7 +61,7 @@
5
6 click_scope_LDFLAGS = \
7 $(builddir)/libclickscope.la \
8- -Wl,-rpath,${libdir}/libunity
9+ -Wl,-rpath,${PROTOCOLPRIVATELIBDIR}
10
11 click_scope_SOURCES = \
12 click-scope-main.vala

Subscribers

People subscribed via source and target branches

to all changes: