From 16b95f91c913f8dc632c653c0dd73755fe61abb3 Mon Sep 17 00:00:00 2001
From: doursse <doursse>
Date: Wed, 30 Jul 2008 13:16:09 +0000
Subject: [PATCH]  install headers in $prefix/include/eina-$VERSION_MAJOR to
 allow parralel  installations between different major versions

SVN revision: 35251
---
 legacy/eina/configure.in                       | 1 +
 legacy/eina/eina.pc.in                         | 4 ++--
 legacy/eina/src/include/Makefile.am            | 6 +++---
 legacy/eina/src/lib/.cvsignore                 | 1 +
 legacy/eina/src/modules/mm_policies/.cvsignore | 3 +++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/legacy/eina/configure.in b/legacy/eina/configure.in
index da8a54050d..e7273a3569 100644
--- a/legacy/eina/configure.in
+++ b/legacy/eina/configure.in
@@ -21,6 +21,7 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
 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(VMAJ)
 AC_SUBST(version_info)
 
 # Checks for programs
diff --git a/legacy/eina/eina.pc.in b/legacy/eina/eina.pc.in
index 7dc5465abf..0548fe4d7e 100644
--- a/legacy/eina/eina.pc.in
+++ b/legacy/eina/eina.pc.in
@@ -8,5 +8,5 @@ Description: Eina
 Requires: 
 Version: @VERSION@
 Libs: -L${libdir} -leina
-Libs.private: -lm -ldl
-Cflags: -I${includedir} -I${includedir}/eina
+Libs.private: -ldl
+Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
diff --git a/legacy/eina/src/include/Makefile.am b/legacy/eina/src/include/Makefile.am
index 9a65096491..0a639cdf57 100644
--- a/legacy/eina/src/include/Makefile.am
+++ b/legacy/eina/src/include/Makefile.am
@@ -14,8 +14,8 @@ eina_rectangle.h \
 eina_types.h \
 eina_stringshare.h
 
-include_HEADERS = \
-Eina.h
+installed_mainheaderdir = $(prefix)/include/eina-@VMAJ@
+installed_mainheader_DATA = Eina.h
 
-installed_headersdir = $(prefix)/include/eina
+installed_headersdir = $(prefix)/include/eina-@VMAJ@/eina
 installed_headers_DATA = $(EINAHEADERS)
diff --git a/legacy/eina/src/lib/.cvsignore b/legacy/eina/src/lib/.cvsignore
index e440fafdac..d337ac7b43 100644
--- a/legacy/eina/src/lib/.cvsignore
+++ b/legacy/eina/src/lib/.cvsignore
@@ -1,3 +1,4 @@
 Makefile.in
 Makefile
+*.lo
 .deps
diff --git a/legacy/eina/src/modules/mm_policies/.cvsignore b/legacy/eina/src/modules/mm_policies/.cvsignore
index e440fafdac..b9f26ab26b 100644
--- a/legacy/eina/src/modules/mm_policies/.cvsignore
+++ b/legacy/eina/src/modules/mm_policies/.cvsignore
@@ -1,3 +1,6 @@
 Makefile.in
 Makefile
+*.la
+*.lo
+.libs
 .deps