From 0cd189a5820193e94d46784d5ebab54e19595f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Sat, 30 Jun 2007 20:37:07 +0000 Subject: [PATCH] =?UTF-8?q?fixInfoDir=20needlessly=20always=20called,=20pa?= =?UTF-8?q?tch=20from=20Eren=20T=C3=BCrkay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/actionsapi/autotools.py | 7 ++++--- pisi/actionsapi/cmaketools.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py index 35be12c3..1b89479f 100644 --- a/pisi/actionsapi/autotools.py +++ b/pisi/actionsapi/autotools.py @@ -122,21 +122,22 @@ def install(parameters = '', argument = 'install'): if system(args): raise InstallError(_('Install failed.')) + else: + fixInfoDir() else: raise InstallError(_('No Makefile found.')) - fixInfoDir() def rawInstall(parameters = '', argument = 'install'): '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()''' if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'): if system('make %s %s' % (parameters, argument)): raise InstallError(_('Install failed.')) + else: + fixInfoDir() else: raise InstallError(_('No Makefile found.')) - fixInfoDir() - def aclocal(parameters = ''): '''generates an aclocal.m4 based on the contents of configure.in.''' if system('aclocal %s' % parameters): diff --git a/pisi/actionsapi/cmaketools.py b/pisi/actionsapi/cmaketools.py index 2867d969..375bf492 100644 --- a/pisi/actionsapi/cmaketools.py +++ b/pisi/actionsapi/cmaketools.py @@ -98,17 +98,17 @@ def install(parameters = '', argument = 'install'): if system(args): raise InstallError(_('Install failed.')) + else: + fixInfoDir() else: raise InstallError(_('No Makefile found.')) - fixInfoDir() - def rawInstall(parameters = '', argument = 'install'): '''install source into install directory with given parameters = PREFIX=%s % get.installDIR()''' if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'): if system('make %s %s' % (parameters, argument)): raise InstallError(_('Install failed.')) + else: + fixInfoDir() else: raise InstallError(_('No Makefile found.')) - - fixInfoDir()