From 5b00d44ec6c847af582b2e31ec2fe0a28b8a3a51 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Thu, 1 Nov 2012 16:45:53 +0000
Subject: [PATCH] merge: fix PACKAGE_DATA_DIR value

The package is named 'efl', but we have to use the name of the library,
so $(pkgdatadir) or $(PACKAGE) should not be used


SVN revision: 78805
---
 src/Makefile_Eet.am    | 2 +-
 src/Makefile_Embryo.am | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 2a1907d5a4..1c186d6820 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -31,7 +31,7 @@ lib_eet_libeet_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/eet/lz4 \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
 -DEFL_EET_BUILD \
 @EFL_CFLAGS@ \
 @EET_CFLAGS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 12acc28b98..d024ba70f4 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -21,7 +21,7 @@ lib_embryo_libembryo_la_CPPFLAGS = \
 -I$(top_builddir)/src/lib/eina \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
 -DEFL_EMBRYO_BUILD \
 @EFL_CFLAGS@
 
@@ -68,7 +68,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
 -I$(top_builddir)/src/lib/embryo \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
 @EFL_CFLAGS@
 
 if HAVE_WINDOWS
@@ -88,4 +88,3 @@ endif
 EXTRA_DIST += \
 bin/embryo/embryo_cc_sc5.scp \
 bin/embryo/embryo_cc_sc7.scp
-