From 4f972b800be10ca6e9db4d532a7d19208699ab52 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 9 Jul 2010 06:28:29 +0000
Subject: [PATCH] Move Efreet (and associated headers) to own dir.

SVN revision: 50143
---
 legacy/efreet/configure.ac        | 2 ++
 legacy/efreet/efreet.pc.in        | 2 +-
 legacy/efreet/src/lib/Makefile.am | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac
index 11dbedf8d8..eaae2c2185 100644
--- a/legacy/efreet/configure.ac
+++ b/legacy/efreet/configure.ac
@@ -49,6 +49,8 @@ AC_SUBST(version_info)
 AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
 ### Needed information
 
diff --git a/legacy/efreet/efreet.pc.in b/legacy/efreet/efreet.pc.in
index e547ee4ca2..2f4db8ec6d 100644
--- a/legacy/efreet/efreet.pc.in
+++ b/legacy/efreet/efreet.pc.in
@@ -8,4 +8,4 @@ Description: Freedesktop standards implementation for the EFL
 @pkgconfig_requires_private@: @requirement_efreet@
 Version: @VERSION@
 Libs: -L${libdir} -lefreet
-Cflags: -I${includedir}/efreet
+Cflags: -I${includedir}/efreet-@VMAJ@
diff --git a/legacy/efreet/src/lib/Makefile.am b/legacy/efreet/src/lib/Makefile.am
index b1fc4f91d6..0b8228e85a 100644
--- a/legacy/efreet/src/lib/Makefile.am
+++ b/legacy/efreet/src/lib/Makefile.am
@@ -25,9 +25,11 @@ efreet_menu.c \
 efreet_utils.c \
 efreet_uri.c
 
+includes_HEADERS = $(EFREETHEADERS) Efreet_Mime.h Efreet_Trash.h
+includesdir = $(includedir)/efreet-@VMAJ@
 
-installed_headersdir = $(includedir)/efreet
-dist_installed_headers_DATA = $(EFREETHEADERS) Efreet_Mime.h Efreet_Trash.h
+# Not sure if this was for 'make dist', so left it in but commented - dh
+# dist_installed_headers_DATA = $(EFREETHEADERS) Efreet_Mime.h Efreet_Trash.h
 
 libefreet_la_SOURCES = $(EFREETSOURCES)
 libefreet_la_CPPFLAGS =  \