actually fix - eina.pc should now be used. consistency with the rest

of efl.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@51160 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/Makefile.am b/Makefile.am
index 0afa8ad..13a6221 100644 (file)
--- a/Makefile.am
+++ b/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/configure.ac b/configure.ac
index d4870ad..7c88fad 100644 (file)
--- a/configure.ac
+++ b/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/eina-1.pc.in b/eina-1.pc.in
deleted file mode 100644 (file)
index 1a5a745..0000000
--- a/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/eina.pc.in b/eina.pc.in
index 6089ac6..1a5a745 100644 (file)
--- a/eina.pc.in
+++ b/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