| 1 |
mabi 08/10/12 12:31:36 |
| 2 |
|
| 3 |
Modified: fox.eclass |
| 4 |
Log: |
| 5 |
fix bug #240060 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.8 eclass/fox.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?rev=1.8&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?rev=1.8&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/fox.eclass?r1=1.7&r2=1.8 |
| 13 |
|
| 14 |
Index: fox.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v |
| 17 |
retrieving revision 1.7 |
| 18 |
retrieving revision 1.8 |
| 19 |
diff -u -r1.7 -r1.8 |
| 20 |
--- fox.eclass 15 Jan 2007 20:27:06 -0000 1.7 |
| 21 |
+++ fox.eclass 12 Oct 2008 12:31:36 -0000 1.8 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2005 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06 mabi Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36 mabi Exp $ |
| 27 |
|
| 28 |
# fox eclass |
| 29 |
# |
| 30 |
@@ -29,7 +29,7 @@ |
| 31 |
# |
| 32 |
# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses |
| 33 |
|
| 34 |
-inherit eutils libtool |
| 35 |
+inherit eutils libtool versionator |
| 36 |
|
| 37 |
|
| 38 |
FOX_PV="${FOX_PV:-${PV}}" |
| 39 |
@@ -110,11 +110,19 @@ |
| 40 |
|
| 41 |
# use the installed headers and library for apps |
| 42 |
for d in ${FOX_APPS} ; do |
| 43 |
- sed -i \ |
| 44 |
- -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \ |
| 45 |
- -e 's:../src/libFOX:-lFOX:' \ |
| 46 |
- -e 's:\.la::' \ |
| 47 |
- ${d}/Makefile.am || die "sed ${d}/Makefile.am error" |
| 48 |
+ if version_is_at_least "1.6.34" ${PV} ; then |
| 49 |
+ sed -i \ |
| 50 |
+ -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \ |
| 51 |
+ -e 's:$(top_builddir)/src/libFOX:-lFOX:' \ |
| 52 |
+ -e 's:\.la::' \ |
| 53 |
+ ${d}/Makefile.am || die "sed ${d}/Makefile.am error" |
| 54 |
+ else |
| 55 |
+ sed -i \ |
| 56 |
+ -e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}:" \ |
| 57 |
+ -e 's:../src/libFOX:-lFOX:' \ |
| 58 |
+ -e 's:\.la::' \ |
| 59 |
+ ${d}/Makefile.am || die "sed ${d}/Makefile.am error" |
| 60 |
+ fi |
| 61 |
done |
| 62 |
|
| 63 |
# Upstream often has trouble with version number transitions |
Archives