From f503b5f75b6db6f0588d4eead9738b4bc19a4b2a Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 9 Jul 2010 06:38:12 +0000
Subject: [PATCH] Move Emotion.h to own dir.

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

diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 66c1f8ea72..c1dec661c0 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -24,7 +24,7 @@ VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
 SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
 version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
 AC_SUBST(version_info)
-
+AC_SUBST(VMAJ)
 
 ### Needed information
 
diff --git a/legacy/emotion/emotion.pc.in b/legacy/emotion/emotion.pc.in
index a0b1cfad04..5126c3b0bc 100644
--- a/legacy/emotion/emotion.pc.in
+++ b/legacy/emotion/emotion.pc.in
@@ -8,4 +8,4 @@ Description: Emotion evas based multimedia library
 @pkgconfig_requires_private@: @requirement_emotion@
 Version: @VERSION@
 Libs: -L${libdir} -lemotion
-Cflags: -I${includedir}
+Cflags: -I${includedir}/emotion-@VMAJ@
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index 76e69ab52f..862df5dc9d 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -24,7 +24,9 @@ AM_CPPFLAGS += @VLC_CFLAGS@
 endif
 
 lib_LTLIBRARIES      = libemotion.la
-include_HEADERS      = Emotion.h
+includes_HEADERS      = Emotion.h
+includesdir = $(includedir)/emotion-@VMAJ@
+
 libemotion_la_SOURCES = emotion_smart.c
 
 if EMOTION_STATIC_BUILD_XINE