kuuko pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/edgar.git/commit/?id=6669595f1af0d17bdb7c10538f21fdbf337de0db
commit 6669595f1af0d17bdb7c10538f21fdbf337de0db
Author: Kai Huuhko <kai.huu...@gmail.com>
Date: Wed Apr 8 22:06:14 2015 +0300
Revert python code install location to libdir/enlightenment/gadgets
As requested by DaveMDS
---
GADGETS/audio/Makefile | 4 ++--
GADGETS/calculator/Makefile | 4 ++--
GADGETS/led_clock/Makefile | 4 ++--
GADGETS/ruler/Makefile | 4 ++--
python/Makefile.am | 2 +-
src/e_mod_edgar.c | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/GADGETS/audio/Makefile b/GADGETS/audio/Makefile
index 8253e78..c6e7b10 100644
--- a/GADGETS/audio/Makefile
+++ b/GADGETS/audio/Makefile
@@ -7,8 +7,8 @@ EXTRA_FILES =
# nothing should be changed below this point
GADGET_FILES = __init__.pyc $(GADGET_NAME).edj
-prefix = $(shell pkg-config --variable=pkgdatadir enlightenment)
-gadget_folder = ${prefix}/gadgets/$(GADGET_NAME)
+prefix = $(shell pkg-config --variable=libdir enlightenment)
+gadget_folder = ${prefix}/enlightenment/gadgets/$(GADGET_NAME)
.PHONY: all install clean
diff --git a/GADGETS/calculator/Makefile b/GADGETS/calculator/Makefile
index 1f62bf4..3a38ebb 100644
--- a/GADGETS/calculator/Makefile
+++ b/GADGETS/calculator/Makefile
@@ -7,8 +7,8 @@ EXTRA_FILES =
# nothing should be changed below this point
GADGET_FILES = __init__.pyc $(GADGET_NAME).edj
-prefix = $(shell pkg-config --variable=pkgdatadir enlightenment)
-gadget_folder = ${prefix}/gadgets/$(GADGET_NAME)
+prefix = $(shell pkg-config --variable=libdir enlightenment)
+gadget_folder = ${prefix}/enlightenment/gadgets/$(GADGET_NAME)
.PHONY: all install clean
diff --git a/GADGETS/led_clock/Makefile b/GADGETS/led_clock/Makefile
index 46e8f41..1001ca0 100644
--- a/GADGETS/led_clock/Makefile
+++ b/GADGETS/led_clock/Makefile
@@ -7,8 +7,8 @@ EXTRA_FILES =
# nothing should be changed below this point
GADGET_FILES = __init__.pyc $(GADGET_NAME).edj
-prefix = $(shell pkg-config --variable=pkgdatadir enlightenment)
-gadget_folder = ${prefix}/gadgets/$(GADGET_NAME)
+prefix = $(shell pkg-config --variable=libdir enlightenment)
+gadget_folder = ${prefix}/enlightenment/gadgets/$(GADGET_NAME)
.PHONY: all install clean
diff --git a/GADGETS/ruler/Makefile b/GADGETS/ruler/Makefile
index 4338b57..44eafb9 100644
--- a/GADGETS/ruler/Makefile
+++ b/GADGETS/ruler/Makefile
@@ -7,8 +7,8 @@ EXTRA_FILES =
# nothing should be changed below this point
GADGET_FILES = __init__.pyc $(GADGET_NAME).edj
-prefix = $(shell pkg-config --variable=pkgdatadir enlightenment)
-gadget_folder = ${prefix}/gadgets/$(GADGET_NAME)
+prefix = $(shell pkg-config --variable=libdir enlightenment)
+gadget_folder = ${prefix}/enlightenment/gadgets/$(GADGET_NAME)
.PHONY: all install clean
diff --git a/python/Makefile.am b/python/Makefile.am
index b93d6fb..9087c14 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
edgarpy_base = e.py
-edgarpydir = $(shell pkg-config --variable=pkgdatadir
enlightenment)/gadgets
+edgarpydir = $(shell pkg-config --variable=libdir
enlightenment)/enlightenment/gadgets
edgarpy_DATA = $(edgarpy_base)
EXTRA_DIST = $(edgarpy_base)
diff --git a/src/e_mod_edgar.c b/src/e_mod_edgar.c
index d844168..d1caf33 100644
--- a/src/e_mod_edgar.c
+++ b/src/e_mod_edgar.c
@@ -101,7 +101,7 @@ edgar_init()
int ret;
// prepare the local scope
- snprintf(buf, sizeof(buf), "%s/data/gadgets", e_prefix_data_get());
+ snprintf(buf, sizeof(buf), "%s/enlightenment/gadgets", e_prefix_lib_get());
edgar_gadgets_system_dir = eina_stringshare_add(buf);
edgar_gadgets =
eina_hash_string_superfast_new(edgar_gadgets_hash_free_func);
--
