Merge lp:~ken-vandine/account-plugins/hardcoded_path into lp:~mardy/account-plugins/qml

Proposed by Ken VanDine on 2013-06-11
Status: Merged
Approved by: Alberto Mardegan on 2013-06-11
Approved revision: 118
Merged at revision: 118
Proposed branch: lp:~ken-vandine/account-plugins/hardcoded_path
Merge into: lp:~mardy/account-plugins/qml
Diff against target: 27 lines (+5/-1)
2 files modified
configure.ac (+5/-0)
debian/control (+0/-1)
To merge this branch: bzr merge lp:~ken-vandine/account-plugins/hardcoded_path
Reviewer Review Type Date Requested Status
Alberto Mardegan 2013-06-11 Approve on 2013-06-11
Review via email: mp+168799@code.launchpad.net

Commit message

  Added a hard-coded path for qmlpluginsdir if pkgconfig failed to get it, this
  way we don't have to build depend on ubuntu-system-settings-online-accounts, which
  isn't in main yet.

Description of the change

  Added a hard-coded path for qmlpluginsdir if pkgconfig failed to get it, this
  way we don't have to build depend on ubuntu-system-settings-online-accounts, which
  isn't in main yet.

To post a comment you must log in.
Alberto Mardegan (mardy) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-06-07 07:35:08 +0000
3+++ configure.ac 2013-06-11 20:00:37 +0000
4@@ -75,6 +75,11 @@
5 # QML plugins installation path
6 AC_SUBST([qmlpluginsdir],
7 [`$PKG_CONFIG --variable plugin_qml_dir --define-variable=prefix=$real_prefix OnlineAccountsPlugin`])
8+AC_MSG_CHECKING(for qmlplugins directory)
9+if test "x$qmlpluginsdir" = "x" ; then
10+ # fallback if the previous failed
11+ qmlpluginsdir="$real_prefix/share/accounts/qml-plugins"
12+fi
13
14 # libaccounts providers and service files
15 AC_SUBST([providersdir],
16
17=== modified file 'debian/control'
18--- debian/control 2013-06-07 11:56:25 +0000
19+++ debian/control 2013-06-11 20:00:37 +0000
20@@ -12,7 +12,6 @@
21 libaccount-plugin-1.0-dev (>= 0.1.3),
22 valac-0.16,
23 gnome-common,
24- ubuntu-system-settings-online-accounts,
25 dh-autoreconf,
26 libxml2-utils,
27 Standards-Version: 3.9.4

Subscribers

People subscribed via source and target branches

to all changes: