From aee8014df642d1890a91a18226fb140cd682c2b6 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 16 Aug 2010 08:03:21 +0000
Subject: [PATCH] actually fix - eina.pc should now be used. consistency with
 the rest of efl.

SVN revision: 51160
---
 legacy/eina/Makefile.am  |  4 ++--
 legacy/eina/configure.ac |  2 +-
 legacy/eina/eina-1.pc.in | 12 ------------
 legacy/eina/eina.pc.in   |  4 ++--
 4 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 legacy/eina/eina-1.pc.in

diff --git a/legacy/eina/Makefile.am b/legacy/eina/Makefile.am
index 0afa8ad32a..13a622194d 100644
--- a/legacy/eina/Makefile.am
+++ b/legacy/eina/Makefile.am
@@ -19,7 +19,7 @@ ltmain.sh \
 missing
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = eina-1.pc
+pkgconfig_DATA = eina.pc
 
 EXTRA_DIST = \
 AUTHORS \
@@ -27,7 +27,7 @@ COPYING \
 README \
 $(pkgconfig_DATA) \
 autogen.sh \
-eina-1.pc.in \
+eina.pc.in \
 eina.spec \
 eina.spec.in \
 m4/ac_attribute.m4 \
diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index d4870ad9fd..7c88fad84b 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -555,7 +555,7 @@ AC_SUBST(requirement_eina)
 
 AC_CONFIG_FILES([
 Makefile
-eina-1.pc
+eina.pc
 eina.spec
 doc/Makefile
 src/Makefile
diff --git a/legacy/eina/eina-1.pc.in b/legacy/eina/eina-1.pc.in
deleted file mode 100644
index 1a5a745253..0000000000
--- a/legacy/eina/eina-1.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Eina
-Description: A Library that implements fast data types and miscellaneous tools
-@pkgconfig_requires_private@: @requirement_eina@
-Version: @VERSION@
-Libs: -L${libdir} -leina
-Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl
-Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
diff --git a/legacy/eina/eina.pc.in b/legacy/eina/eina.pc.in
index 6089ac6bce..1a5a745253 100644
--- a/legacy/eina/eina.pc.in
+++ b/legacy/eina/eina.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: Eina
-Description: Eina
+Description: A Library that implements fast data types and miscellaneous tools
 @pkgconfig_requires_private@: @requirement_eina@
 Version: @VERSION@
 Libs: -L${libdir} -leina
-Libs.private: -ldl
+Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl
 Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina