summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2014-08-29 19:45:46 +0200
committerTom Hacohen <tom@stosb.com>2014-09-02 10:29:50 +0100
commit0986814381b64b6fb217889c39a840cf324a9d0c (patch)
tree843e2fa0fabc4551387a8e3c0e3ed8d9a37ba2e2 /src
parentb19ee318d451bb9337d11f4bc93c9d249a05cc07 (diff)
Use pkglibdir instead of libdir/elementary
This is cleaner and more correct.
Diffstat (limited to 'src')
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/modules/access_output/Makefile.am2
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am2
-rw-r--r--src/modules/prefs/Makefile.am4
-rw-r--r--src/modules/test_entry/Makefile.am2
-rw-r--r--src/modules/test_map/Makefile.am2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3038a7138..fb285d70f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/Makefile_Eolian_Cxx_Helper.am
11 11
12AM_CPPFLAGS = \ 12AM_CPPFLAGS = \
13-DELM_INTERNAL_API_ARGESFSDFEFC=1 \ 13-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
14-DMODULES_PATH=\"$(libdir)/elementary/modules\" \ 14-DMODULES_PATH=\"$(pkglibdir)/modules\" \
15-I. \ 15-I. \
16-I$(top_builddir) \ 16-I$(top_builddir) \
17-I$(top_srcdir) \ 17-I$(top_srcdir) \
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index cfd9646fd..84cd94f4f 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ 22@ELEMENTARY_WAYLAND_CFLAGS@
23 23
24pkgdir = $(libdir)/elementary/modules/access_output/$(MODULE_ARCH) 24pkgdir = $(pkglibdir)/modules/access_output/$(MODULE_ARCH)
25pkg_LTLIBRARIES = module.la 25pkg_LTLIBRARIES = module.la
26 26
27module_la_SOURCES = mod.c 27module_la_SOURCES = mod.c
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index ddf10b5cc..dcf48e476 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
24@ELEMENTARY_EMAP_CFLAGS@ \ 24@ELEMENTARY_EMAP_CFLAGS@ \
25@ELEMENTARY_DRM_CFLAGS@ 25@ELEMENTARY_DRM_CFLAGS@
26 26
27pkgdir = $(libdir)/elementary/modules/datetime_input_ctxpopup/$(MODULE_ARCH) 27pkgdir = $(pkglibdir)/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
28pkg_LTLIBRARIES = module.la 28pkg_LTLIBRARIES = module.la
29 29
30module_la_SOURCES = datetime_input_ctxpopup.c 30module_la_SOURCES = datetime_input_ctxpopup.c
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 49239c38c..ab11da632 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -5,7 +5,7 @@ include ../../../Makefile_Elm_Helpers.am
5EXTRA_DIST = \ 5EXTRA_DIST = \
6elm_prefs_swallow.edc 6elm_prefs_swallow.edc
7 7
8filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH) 8filesdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
9files_DATA = elm_prefs_swallow.edj 9files_DATA = elm_prefs_swallow.edj
10 10
11elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc 11elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc
@@ -33,7 +33,7 @@ AM_CPPFLAGS = \
33@ELEMENTARY_EMAP_CFLAGS@ \ 33@ELEMENTARY_EMAP_CFLAGS@ \
34@ELEMENTARY_WAYLAND_CFLAGS@ 34@ELEMENTARY_WAYLAND_CFLAGS@
35 35
36pkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH) 36pkgdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
37pkg_LTLIBRARIES = module.la 37pkg_LTLIBRARIES = module.la
38 38
39module_la_SOURCES = \ 39module_la_SOURCES = \
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 167f660ff..473866a1c 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ 22@ELEMENTARY_WAYLAND_CFLAGS@
23 23
24pkgdir = $(libdir)/elementary/modules/test_entry/$(MODULE_ARCH) 24pkgdir = $(pkglibdir)/modules/test_entry/$(MODULE_ARCH)
25pkg_LTLIBRARIES = module.la 25pkg_LTLIBRARIES = module.la
26 26
27module_la_SOURCES = mod.c 27module_la_SOURCES = mod.c
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 01a1fa025..9aa21c6dc 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ 22@ELEMENTARY_WAYLAND_CFLAGS@
23 23
24pkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH) 24pkgdir = $(pkglibdir)/modules/test_map/$(MODULE_ARCH)
25pkg_LTLIBRARIES = module.la 25pkg_LTLIBRARIES = module.la
26 26
27module_la_SOURCES = mod.c 27module_la_SOURCES = mod.c