From e9d4afc9d7f2e46103bc82e16c3d003050fec942 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 8 Jul 2010 03:05:00 +0000
Subject: [PATCH] moved eet.h to its own dir - pkgconfig handles all the right
 stuff.

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

diff --git a/legacy/eet/ChangeLog b/legacy/eet/ChangeLog
index 0fa13cc90c..92c57971b5 100644
--- a/legacy/eet/ChangeLog
+++ b/legacy/eet/ChangeLog
@@ -394,3 +394,8 @@
 
 	* Add eet_alias support.
 	* Fix possible dead lock in eet_write_cipher.
+
+2010-07-08  Carsten Haitzler (The Rasterman)
+
+        * Moved Eet.h into $includedir/eet-MAJOR_VERSION/
+
diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac
index c80439bc39..80639c0170 100644
--- a/legacy/eet/configure.ac
+++ b/legacy/eet/configure.ac
@@ -49,7 +49,8 @@ AC_SUBST(version_info)
 AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
 ### Default options with respect to host
 
diff --git a/legacy/eet/eet.pc.in b/legacy/eet/eet.pc.in
index df841e28f6..f7a3bf1097 100644
--- a/legacy/eet/eet.pc.in
+++ b/legacy/eet/eet.pc.in
@@ -9,5 +9,5 @@ Description: Library for speedy data storage, retrieval, and compression
 Version: @VERSION@
 Libs: -L${libdir} -leet
 Libs.private: @EET_LIBS@ @EFL_FNMATCH_LIBS@ @LIBGCRYPT_LIBS@ -ljpeg -lz -lm
-Cflags: -I${includedir}
+Cflags: -I${includedir}/eet-@VMAJ@
 Cflags.private: @LIBGCRYPT_CFLAGS@
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index 388b73d2ca..9f8bcabe40 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 @OPENSSL_CFLAGS@ \
 @GNUTLS_CFLAGS@
 
-include_HEADERS = Eet.h
+includes_HEADERS = Eet.h
+includesdir = $(includedir)/eet-@VMAJ@
 
 lib_LTLIBRARIES = libeet.la