[gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass

[Bernard Cafarelli (voyageur)]

voyageur    11/06/28 15:27:23

  Modified:             gnustep-base.eclass
  Log:
  Allow possiblle trailing slashes in src_prepare path cleanup, thanks Rion

Revision  Changes    Path
1.19                 eclass/gnustep-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?r1=1.18&r2=1.19

Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnustep-base.eclass	8 Jun 2011 08:55:55 -0000	1.18
+++ gnustep-base.eclass	28 Jun 2011 15:27:23 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.18 2011/06/08 08:55:55 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.19 2011/06/28 15:27:23 voyageur Exp $
 
 # @ECLASS: gnustep-base.eclass
 # @MAINTAINER:
@@ -55,10 +55,10 @@
 		# to know when they use some direct include.
 		ebegin "Cleaning paths from GNUmakefile"
 		sed -i \
-			-e 's|-I/usr/X11R6/include||g' \
-			-e 's|-I/usr/include||g' \
-			-e 's|-L/usr/X11R6/lib||g' \
-			-e 's|-L/usr/lib||g' \
+			-e 's|-I/usr/X11R6/include/\?||g' \
+			-e 's|-I/usr/include/\?||g' \
+			-e 's|-L/usr/X11R6/lib/\?||g' \
+			-e 's|-L/usr/lib/\?||g' \
 			GNUmakefile
 		eend $?
 	fi