tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0986814381b64b6fb217889c39a840cf324a9d0c
commit 0986814381b64b6fb217889c39a840cf324a9d0c
Author: Vincent Torri <vincent dot torri at gmail dot com>
Date: Fri Aug 29 19:45:46 2014 +0200
Use pkglibdir instead of libdir/elementary
This is cleaner and more correct.
---
src/lib/Makefile.am | 2 +-
src/modules/access_output/Makefile.am | 2 +-
src/modules/datetime_input_ctxpopup/Makefile.am | 2 +-
src/modules/prefs/Makefile.am | 4 ++--
src/modules/test_entry/Makefile.am | 2 +-
src/modules/test_map/Makefile.am | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3038a71..fb285d7 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/Makefile_Eolian_Cxx_Helper.am
AM_CPPFLAGS = \
-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
--DMODULES_PATH=\"$(libdir)/elementary/modules\" \
+-DMODULES_PATH=\"$(pkglibdir)/modules\" \
-I. \
-I$(top_builddir) \
-I$(top_srcdir) \
diff --git a/src/modules/access_output/Makefile.am
b/src/modules/access_output/Makefile.am
index cfd9646..84cd94f 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_EMAP_CFLAGS@ \
@ELEMENTARY_WAYLAND_CFLAGS@
-pkgdir = $(libdir)/elementary/modules/access_output/$(MODULE_ARCH)
+pkgdir = $(pkglibdir)/modules/access_output/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = mod.c
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am
b/src/modules/datetime_input_ctxpopup/Makefile.am
index ddf10b5..dcf48e4 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_EMAP_CFLAGS@ \
@ELEMENTARY_DRM_CFLAGS@
-pkgdir = $(libdir)/elementary/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
+pkgdir = $(pkglibdir)/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = datetime_input_ctxpopup.c
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 49239c3..ab11da6 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -5,7 +5,7 @@ include ../../../Makefile_Elm_Helpers.am
EXTRA_DIST = \
elm_prefs_swallow.edc
-filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
+filesdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
files_DATA = elm_prefs_swallow.edj
elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc
@@ -33,7 +33,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_EMAP_CFLAGS@ \
@ELEMENTARY_WAYLAND_CFLAGS@
-pkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
+pkgdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = \
diff --git a/src/modules/test_entry/Makefile.am
b/src/modules/test_entry/Makefile.am
index 167f660..473866a 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_EMAP_CFLAGS@ \
@ELEMENTARY_WAYLAND_CFLAGS@
-pkgdir = $(libdir)/elementary/modules/test_entry/$(MODULE_ARCH)
+pkgdir = $(pkglibdir)/modules/test_entry/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = mod.c
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 01a1fa0..9aa21c6 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
@ELEMENTARY_EMAP_CFLAGS@ \
@ELEMENTARY_WAYLAND_CFLAGS@
-pkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH)
+pkgdir = $(pkglibdir)/modules/test_map/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = mod.c
--
