From 057ea2934a20fa492194aecaaf84df933553670a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6k=C3=A7en=20Eraslan?= Date: Mon, 16 Aug 2010 07:00:57 +0000 Subject: [PATCH] actionsapi/cmaketools: Remove Makefile check Developer may add '-C dir' parameter, so we should take this into account. --- pisi/actionsapi/cmaketools.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pisi/actionsapi/cmaketools.py b/pisi/actionsapi/cmaketools.py index 0a50c3d1..2346231b 100644 --- a/pisi/actionsapi/cmaketools.py +++ b/pisi/actionsapi/cmaketools.py @@ -69,16 +69,13 @@ def configure(parameters = '', installPrefix = '/%s' % get.defaultprefixDIR(), s def make(parameters = ''): '''build source with given parameters''' - if can_access_file('Makefile'): - if ctx.config.get_option("verbose") and ctx.config.get_option("debug"): - command = 'make VERBOSE=1 %s %s' % (get.makeJOBS(), parameters) - else: - command = 'make %s %s' % (get.makeJOBS(), parameters) - - if system(command): - raise MakeError(_('Make failed.')) + if ctx.config.get_option("verbose") and ctx.config.get_option("debug"): + command = 'make VERBOSE=1 %s %s' % (get.makeJOBS(), parameters) else: - raise InstallError(_('No Makefile found.')) + command = 'make %s %s' % (get.makeJOBS(), parameters) + + if system(command): + raise MakeError(_('Make failed.')) def fixInfoDir(): infoDir = '%s/usr/share/info/dir' % get.installDIR()