Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixInfoDir needlessly always called, patch from Eren Türkay

Browse Source
This commit is contained in:
S.Çağlar Onur
2007-06-30 20:37:07 +00:00
parent 993c75e3b8
commit 0cd189a582
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/actionsapi/autotools.py
+4 -3
View File
@@ -122,21 +122,22 @@ def install(parameters = '', argument = 'install'):
if system(args): if system(args):
raise InstallError(_('Install failed.')) raise InstallError(_('Install failed.'))
else:
fixInfoDir()
else: else:
raise InstallError(_('No Makefile found.')) raise InstallError(_('No Makefile found.'))
fixInfoDir()
def rawInstall(parameters = '', argument = 'install'): def rawInstall(parameters = '', argument = 'install'):
'''install source into install directory with given parameters = PREFIX=%s % get.installDIR()''' '''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 can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
if system('make %s %s' % (parameters, argument)): if system('make %s %s' % (parameters, argument)):
raise InstallError(_('Install failed.')) raise InstallError(_('Install failed.'))
else:
fixInfoDir()
else: else:
raise InstallError(_('No Makefile found.')) raise InstallError(_('No Makefile found.'))
fixInfoDir()
def aclocal(parameters = ''): def aclocal(parameters = ''):
'''generates an aclocal.m4 based on the contents of configure.in.''' '''generates an aclocal.m4 based on the contents of configure.in.'''
if system('aclocal %s' % parameters): if system('aclocal %s' % parameters):
pisi/actionsapi/cmaketools.py
+4 -4
View File
@@ -98,17 +98,17 @@ def install(parameters = '', argument = 'install'):
if system(args): if system(args):
raise InstallError(_('Install failed.')) raise InstallError(_('Install failed.'))
else:
fixInfoDir()
else: else:
raise InstallError(_('No Makefile found.')) raise InstallError(_('No Makefile found.'))
fixInfoDir()
def rawInstall(parameters = '', argument = 'install'): def rawInstall(parameters = '', argument = 'install'):
'''install source into install directory with given parameters = PREFIX=%s % get.installDIR()''' '''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 can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'):
if system('make %s %s' % (parameters, argument)): if system('make %s %s' % (parameters, argument)):
raise InstallError(_('Install failed.')) raise InstallError(_('Install failed.'))
else:
fixInfoDir()
else: else:
raise InstallError(_('No Makefile found.')) raise InstallError(_('No Makefile found.'))
fixInfoDir()