diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2005-05-05 01:55:33 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2005-05-05 01:55:33 +0000 |
| commit | ff69fa4e9af8e59fe048d5da7a3db794b886d8fe (patch) | |
| tree | 9812419f2f90a0776ea054042a7cffac098587da /eclass | |
| parent | Make sure /var/lib/iptables/rules-saves is only read/writable by root #91468 ... (diff) | |
| download | historical-ff69fa4e9af8e59fe048d5da7a3db794b886d8fe.tar.gz historical-ff69fa4e9af8e59fe048d5da7a3db794b886d8fe.tar.bz2 historical-ff69fa4e9af8e59fe048d5da7a3db794b886d8fe.zip | |
Fix up some things that broke with the re-organization.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gtk-sharp-component.eclass | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/eclass/gtk-sharp-component.eclass b/eclass/gtk-sharp-component.eclass index 4bd8d7593459..5a13d3cff5e3 100644 --- a/eclass/gtk-sharp-component.eclass +++ b/eclass/gtk-sharp-component.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-component.eclass,v 1.8 2005/05/03 22:21:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-component.eclass,v 1.9 2005/05/05 01:55:33 latexer Exp $ # Author : Peter Johanson <latexer@gentoo.org> # Based off of original work in gst-plugins.eclass by <foser@gentoo.org> @@ -68,6 +68,11 @@ gtk-sharp-component_fix_makefiles() { GAPI_CODEGEN="gapi${GTK_SHARP_COMPONENT_SLOT}-codegen" GTK_SHARP_LIB_DIR="${ROOT}/usr/$(get_libdir)/mono/gtk-sharp${GTK_SHARP_COMPONENT_SLOT_DEC}" + # Universal changes needed for all versions + sed -i -e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).xml;${GAPI_DIR}/\2.xml;g" \ + -i -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \ + $(find ${S} -name Makefile.in) || die "Failed to fix the gtk-sharp makefiles" + # Changes specific to 1.9.3 if [ "${PV}" == "1.9.3" ] ; then einfo "Got 1.9.3 version" @@ -78,26 +83,22 @@ gtk-sharp-component_fix_makefiles() { $(find ${S} -name Makefile.in) || die "Failed to fix the gtk-sharp makefiles" fi - # Changes only in 1.0.x or 1.9.x, respectively - if [ "${PV:0:3}" == "1.9" ] ; then - sed -i -e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \ - $(find ${S} -name Makefile.in) || die "Failed to fix the gtk-sharp makefiles" - elif [ "${PV:0:3}" == "1.0" ] ; then - sed -i -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \ - $(find ${S} -name Makefile.in) || die "Failed to fix the gtk-sharp makefiles" - fi - # Changes universal up to and including 1.9.2 if [ "${PV}" == "1.9.2" ] || [ "${PV:0:3}" = "1.0" ] ; then sed -i -e "s:\$(RUNTIME) \.\./parser/gapi-fixup.exe:${GAPI_FIXUP}:" \ -e "s:\$(RUNTIME) \.\./generator/gapi_codegen.exe:${GAPI_CODEGEN}:" \ -e "s: \.\./generator/gapi_codegen.exe::" \ $(find ${S} -name Makefile.in) || die "Failed to fix the gtk-sharp makefiles" + #-i -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \ fi - # Universal changes needed for all versions - sed -i -e "s;\(\.\.\|\$(top_srcdir)\)/[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).xml;${GAPI_DIR}/\2.xml;g" \ + # Changes only in 1.9.x + if [ "${PV:0:3}" == "1.9" ] ; then + sed -i -e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \ $(find ${S} -name Makefile.in) || die "Failed to fix the gtk-sharp makefiles" + #sed -i -e "s;/r:\(\.\./\)*[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;/r:${GTK_SHARP_LIB_DIR}/\2.dll;g" \ + #-i -e "s;\.\./[[:alpha:]]*/\([[:alpha:]]*-[[:alpha:]]*\).dll;${GTK_SHARP_LIB_DIR}/\1.dll;g" \ + fi } |