From: Quentin Glidic <[email protected]>
Signed-off-by: Quentin Glidic <[email protected]>
---
configure.ac | 4 ++++
src/Makefile.am | 1 -
src/weston.pc.in | 2 ++
src/xwayland/Makefile.am | 1 -
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index fd85b2c..790ebbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,10 @@ AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes])
WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol'])
+# Define the module directory here
+moduledir='${libdir}/weston'
+AC_SUBST([moduledir])
+
AC_CONFIG_FILES([Makefile
shared/Makefile
src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 859f583..f5e0a92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,7 +94,6 @@ westoninclude_HEADERS = \
../shared/matrix.h \
../shared/config-parser.h
-moduledir = $(libdir)/weston
module_LTLIBRARIES = \
$(desktop_shell) \
$(tablet_shell) \
diff --git a/src/weston.pc.in b/src/weston.pc.in
index 8d5ebde..18759ab 100644
--- a/src/weston.pc.in
+++ b/src/weston.pc.in
@@ -3,6 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+moduledir=@moduledir@
+
Name: Weston Plugin API
Description: Header files for Weston plugin development
Version: @WESTON_VERSION@
diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am
index 3a26cbd..1f8ee5c 100644
--- a/src/xwayland/Makefile.am
+++ b/src/xwayland/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
-DLIBEXECDIR='"$(libexecdir)"' \
-DXSERVER_PATH='"@XSERVER_PATH@"'
-moduledir = @libdir@/weston
module_LTLIBRARIES = xwayland.la
xwayland = xwayland.la
--
1.8.2.3
_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
