[gentoo-commits] gentoo-x86 commit in eclass: fox.eclass

["Matti Bickel (mabi)" <mabi@gentoo.org>]

mabi        08/10/12 12:31:36

  Modified:             fox.eclass
  Log:
  fix bug #240060

Revision  Changes    Path
1.8                  eclass/fox.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?r1=1.7&r2=1.8

Index: fox.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fox.eclass	15 Jan 2007 20:27:06 -0000	1.7
+++ fox.eclass	12 Oct 2008 12:31:36 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36 mabi Exp $
 
 # fox eclass
 #
@@ -29,7 +29,7 @@
 #
 # Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
 
-inherit eutils libtool
+inherit eutils libtool versionator
 
 
 FOX_PV="${FOX_PV:-${PV}}"
@@ -110,11 +110,19 @@
 
 	# use the installed headers and library for apps
 	for d in ${FOX_APPS} ; do
-		sed -i \
-			-e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
-			-e 's:../src/libFOX:-lFOX:' \
-			-e 's:\.la::' \
-			${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+		if version_is_at_least "1.6.34" ${PV} ; then
+			sed -i \
+				-e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
+				-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
+				-e 's:\.la::' \
+				${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+		else
+			sed -i \
+				-e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \
+				-e 's:../src/libFOX:-lFOX:' \
+				-e 's:\.la::' \
+				${d}/Makefile.am || die "sed ${d}/Makefile.am error"
+		fi
 	done
 
 	# Upstream often has trouble with version number transitions