Merge lp:~mhr3/unity-lens-files/fix-scope-dir into lp:~unity-team/unity-lens-files/libunity7-compatible

Proposed by Michal Hruby on 2013-03-14
Status: Merged
Approved by: Martin Mrazik on 2013-03-15
Approved revision: 253
Merged at revision: 254
Proposed branch: lp:~mhr3/unity-lens-files/fix-scope-dir
Merge into: lp:~unity-team/unity-lens-files/libunity7-compatible
Diff against target: 12 lines (+1/-1)
1 file modified
Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~mhr3/unity-lens-files/fix-scope-dir
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-03-15
Paweł Stołowski 2013-03-14 Approve on 2013-03-15
Review via email: mp+153433@code.launchpad.net

Commit message

Fix scope directory

Description of the change

Fix scope directory.

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote :

+1

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-03-12 13:43:11 +0000
3+++ Makefile.am 2013-03-14 18:19:22 +0000
4@@ -4,7 +4,7 @@
5 # Install the files-local.scope file
6 #
7 scope_in_files = files-local.scope.in
8-scopedir = $(SCOPESDIR)
9+scopedir = $(SCOPESDIR)/files
10 scope_DATA = $(scope_in_files:.scope.in=.scope)
11
12 icondir = $(datadir)/unity/themes

Subscribers

People subscribed via source and target branches

to all changes: