diff options
| author | Gabriele Svelto <gabriele.svelto@gmail.com> | 2012-05-16 20:12:05 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2012-05-20 06:52:34 +0200 |
| commit | 7f2c7dad20135db9a898d9a9e5533783575a3fd0 (patch) | |
| tree | 7230699d190722a9b1352f062eade5cd2b36da39 | |
| parent | 8c23de9f2abc2ec21d4b74785fd175050909176e (diff) | |
Install plugins under $(libdir) to simplify multi-arch packaging
Signed-off-by: Gabriele Svelto <gabriele.svelto@gmail.com>
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/ctx.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 033ba52..390dc50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -151,7 +151,7 @@ else libxs_la_LDFLAGS = -version-info @LIBXS_ABI_VERSION@ @LIBXS_EXTRA_LDFLAGS@ endif -libxs_la_CPPFLAGS = -DXS_PREFIX_PATH='"$(prefix)"' +libxs_la_CPPFLAGS = -DXS_LIBDIR_PATH='"$(libdir)"' libxs_la_CXXFLAGS = @LIBXS_EXTRA_CXXFLAGS@ if BUILD_PGM diff --git a/src/ctx.cpp b/src/ctx.cpp index abe3bb4..7f4c88a 100644 --- a/src/ctx.cpp +++ b/src/ctx.cpp @@ -132,8 +132,8 @@ next: #elif XS_HAVE_PLUGINS // Load all the installed plug-ins. - std::string path (XS_PREFIX_PATH); - path += "/lib/xs/plugins"; + std::string path (XS_LIBDIR_PATH); + path += "/xs/plugins"; DIR *dp = opendir (path.c_str ()); if (!dp && (errno == ENOENT || errno == EACCES || errno == ENOTDIR)) |