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

[Michal Hruby]

Fix scope directory

Fix scope directory.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-ci/1/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-autolanding/1/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs-pt/1743/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-files-libunity7-compatible-raring-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Makefile.am'
--- Makefile.am	2013-03-12 13:43:11 +0000
+++ Makefile.am	2013-03-14 18:19:22 +0000
@@ -4,7 +4,7 @@
 # Install the files-local.scope file
 #
 scope_in_files = files-local.scope.in
-scopedir = $(SCOPESDIR)
+scopedir = $(SCOPESDIR)/files
 scope_DATA = $(scope_in_files:.scope.in=.scope)
 
 icondir = $(datadir)/unity/themes