summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2015-02-25 16:31:50 +0100
committerFlavio Ceolin <flavio.ceolin@gmail.com>2015-03-07 20:04:20 -0300
commit3230101d6a262060bbba8835027d954ee35e7954 (patch)
tree7c0ba507a0bc58e217c4800344cd9360ebbd086b
parent097db9786fb7e94b4fb75a854ba8dd3c1382c975 (diff)
Fixed buildsystem so you dont have to pass --prefix
-rw-r--r--configure.ac6
-rw-r--r--src/lib/emix.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index ea93bf7..e293955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,8 +97,8 @@ AC_ARG_ENABLE(homedir-install,
97) 97)
98 98
99AC_SUBST(pkgdir) 99AC_SUBST(pkgdir)
100backendsdir="$prefix/lib/emix/" 100backends_sub_dir="/emix/"
101AC_DEFINE_UNQUOTED(BACKENDS_DIR, "$backendsdir", "Backends dir) 101AC_DEFINE_UNQUOTED(BACKEND_DIR, "$backends_sub_dir", "Directory where to find the backends in located in prefix")
102 102
103# Checks for header files. 103# Checks for header files.
104 104
@@ -136,7 +136,7 @@ echo " CFLAGS...................: $CFLAGS"
136echo " LDFLAGS..................: $LDFLAGS" 136echo " LDFLAGS..................: $LDFLAGS"
137echo 137echo
138echo "Installation...............: make install (as root if needed, with 'su' or 'sudo')" 138echo "Installation...............: make install (as root if needed, with 'su' or 'sudo')"
139echo " backends.................: $backendsdir" 139echo " backends.................: $libdir$backends_sub_dir"
140echo " prefix...................: $prefix" 140echo " prefix...................: $prefix"
141echo " module...................: $pkgdir" 141echo " module...................: $pkgdir"
142echo 142echo
diff --git a/src/lib/emix.c b/src/lib/emix.c
index cd2490e..485b76b 100644
--- a/src/lib/emix.c
+++ b/src/lib/emix.c
@@ -70,6 +70,7 @@ _backend_get_cb(Eina_Module *module, void *data EINA_UNUSED)
70Eina_Bool 70Eina_Bool
71emix_init(void) 71emix_init(void)
72{ 72{
73 char path[PATH_MAX];
73 if (_init_count > 0) 74 if (_init_count > 0)
74 goto end; 75 goto end;
75 76
@@ -99,8 +100,10 @@ emix_init(void)
99 goto err_ecore; 100 goto err_ecore;
100 } 101 }
101 102
103 snprintf(path, sizeof(path), "%s%s",PACKAGE_LIB_DIR, BACKEND_DIR);
104
102 ctx->backends = eina_module_list_get(ctx->backends, 105 ctx->backends = eina_module_list_get(ctx->backends,
103 BACKENDS_DIR, EINA_TRUE, 106 path, EINA_TRUE,
104 _backend_get_cb, NULL); 107 _backend_get_cb, NULL);
105 if (ctx->backends == NULL) 108 if (ctx->backends == NULL)
106 { 109 {