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

[Peter Alfredsen (loki_val)]

loki_val    09/01/18 18:21:08

  Modified:             base.eclass
  Log:
  Rip default() functions so we only run econf and emake if the appropriate files exist.

Revision  Changes    Path
1.37                 eclass/base.eclass

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

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- base.eclass	17 Jan 2009 16:56:55 -0000	1.36
+++ base.eclass	18 Jan 2009 18:21:08 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.36 2009/01/17 16:56:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.37 2009/01/18 18:21:08 loki_val Exp $
 
 # @ECLASS: base.eclass
 # @MAINTAINER:
@@ -166,11 +166,17 @@
 	case $1 in
 		configure)
 			debug-print-section configure
-			econf || die "died running econf, $FUNCNAME:configure"
+			if [[ -x ${ECONF_SOURCE:-.}/configure ]]
+			then
+				econf || die "died running econf, $FUNCNAME:configure"
+			fi
 			;;
 		make)
 			debug-print-section make
-			emake || die "died running emake, $FUNCNAME:make"
+			if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]
+			then
+				emake || die "died running emake, $FUNCNAME:make"
+			fi
 			;;
 		all)
 			debug-print-section all