| 1 |
commit: 2e186ba09e162af23996042975aeb16fe14793b1 |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 27 13:07:04 2016 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 27 13:12:50 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e186ba0 |
| 7 |
|
| 8 |
net-im/ejabberd: Move ejabberd out of /usr/lib/erlang/lib |
| 9 |
|
| 10 |
ejabberd may override some modules if it's in default Erlang search |
| 11 |
path. Move it back to default location set by configure script which is |
| 12 |
/usr/lib. |
| 13 |
|
| 14 |
Gentoo-Bug: 591862 |
| 15 |
|
| 16 |
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 7 +++++-- |
| 17 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-16.04-r1.ebuild |
| 20 |
index 3f1c777..104edf0 100644 |
| 21 |
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild |
| 22 |
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild |
| 23 |
@@ -132,8 +132,12 @@ ejabberd_cert_install() { |
| 24 |
} |
| 25 |
|
| 26 |
# Get path to ejabberd lib directory. |
| 27 |
+# |
| 28 |
+# This is the path ./configure script Base for this path is path set in |
| 29 |
+# ./configure script which is /usr/lib by default. If libdir is explicitely set |
| 30 |
+# to something else than this should be adjusted here as well. |
| 31 |
get_ejabberd_path() { |
| 32 |
- echo "$(get_erl_libs)/${P}" |
| 33 |
+ echo "/usr/$(get_libdir)/${P}" |
| 34 |
} |
| 35 |
|
| 36 |
# Make ejabberd.service for systemd from upstream provided template. |
| 37 |
@@ -188,7 +192,6 @@ src_prepare() { |
| 38 |
src_configure() { |
| 39 |
econf \ |
| 40 |
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
| 41 |
- --libdir="${EPREFIX}$(get_erl_libs)" \ |
| 42 |
--enable-user=jabber \ |
| 43 |
$(use_enable debug) \ |
| 44 |
$(use_enable full-xml) \ |
Archives