From 5cf875426f5125b0d3d3a313da17012bafb28a03 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 9 Jul 2010 06:35:02 +0000
Subject: [PATCH] Move Edje (and associated headers) to own dir.

SVN revision: 50146
---
 legacy/edje/configure.ac        | 2 ++
 legacy/edje/edje.pc.in          | 2 +-
 legacy/edje/src/lib/Makefile.am | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac
index 8179b4c106..e5469eb9b3 100644
--- a/legacy/edje/configure.ac
+++ b/legacy/edje/configure.ac
@@ -50,6 +50,8 @@ AC_SUBST(version_info)
 AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
 AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["$shrext_cmds"], [Suffix for shared objects])
 
diff --git a/legacy/edje/edje.pc.in b/legacy/edje/edje.pc.in
index 3166082b9c..815730f3da 100644
--- a/legacy/edje/edje.pc.in
+++ b/legacy/edje/edje.pc.in
@@ -11,4 +11,4 @@ Description: Enlightened graphical design and layout engine.
 Version: @VERSION@
 Libs: -L${libdir} -ledje
 Libs.private: @lua_libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/edje-@VMAJ@
diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am
index 4d9132596b..80a3e4ed9b 100644
--- a/legacy/edje/src/lib/Makefile.am
+++ b/legacy/edje/src/lib/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 
 lib_LTLIBRARIES = libedje.la
 
-include_HEADERS = Edje.h Edje_Edit.h edje_convert.h
+includes_HEADERS = Edje.h Edje_Edit.h edje_convert.h
+includesdir = $(includedir)/edje-@VMAJ@
 
 base_sources = \
 edje_calc.c \