1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From: Ole Streicher <debian@liska.ath.cx>
Date: Tue, 29 Aug 2017 13:21:57 +0200
Subject: Set the default plugin path
In Debian, they are installed in a path according to the Linux FHS and
Multi arch compatible.
---
acinclude.m4 | 5 ++++-
etc/esorex.rc.in | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 27df1e4..3dd9a01 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -36,7 +36,10 @@ AC_DEFUN([ESOREX_SET_PATHS],
AC_SUBST(configdir)
if test -z "$recipedir"; then
- recipedir="`eval echo $libdir`"
+ recipedir="`eval echo $libdir`/cpl/plugins"
+ if test $libdir != "/usr/lib"; then
+ recipedir="$recipedir:/usr/lib/cpl/plugins"
+ fi
fi
AC_SUBST(recipedir)
diff --git a/etc/esorex.rc.in b/etc/esorex.rc.in
index a249737..395259b 100644
--- a/etc/esorex.rc.in
+++ b/etc/esorex.rc.in
@@ -122,7 +122,7 @@ esorex.caller.recipes=FALSE
# as well. Multiple directory heads may be specified, by separating the
# starting paths with colons (:). This option may also be set using the
# environment variable ESOREX_PLUGIN_DIR.
-esorex.caller.recipe-dir=@recipedir@/esopipes-plugins
+esorex.caller.recipe-dir=@recipedir@
# --suppress-link
# When TRUE, no symbolic link is created to the output product. However, if
|
