From 8f852f42b74e1bc6d9b23e98a03d37d0177e54d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 24 Aug 2005 23:10:03 +0000 Subject: [PATCH] =?UTF-8?q?install=20ve=20rawInstall'a=20arguman=20deste?= =?UTF-8?q?=C4=9Fi=20geldi,=20make=20DESTDIR=20soinstall=20->=20rawInstall?= =?UTF-8?q?(...,=20soinstall)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/actionsapi/autotools.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py index ac752496..608f8fba 100644 --- a/pisi/actionsapi/autotools.py +++ b/pisi/actionsapi/autotools.py @@ -83,7 +83,7 @@ def make(parameters = ''): if system('make %s' % parameters): raise MakeError('!!! Make failed...\n') -def install(parameters = ''): +def install(parameters = '', argument = 'install'): '''install source into install directory with given parameters''' if can_access_file('makefile') or can_access_file('Makefile') or can_access_file('GNUmakefile'): args = 'make prefix=%(prefix)s/%(defaultprefix)s \ @@ -93,24 +93,25 @@ def install(parameters = ''): mandir=%(prefix)s/%(man)s \ sysconfdir=%(prefix)s/%(conf)s \ %(parameters)s \ - install' % {'prefix': get.installDIR(), + %(argument)s' % {'prefix': get.installDIR(), 'defaultprefix': get.defaultprefixDIR(), 'man': get.manDIR(), 'info': get.infoDIR(), 'localstate': get.localstateDIR(), 'conf': get.confDIR(), 'data': get.dataDIR(), - 'parameters': parameters} + 'parameters': parameters, + 'argument':argument} if system(args): raise InstallError('!!! Install failed...\n') else: raise InstallError('!!! No Makefile found...\n') -def rawInstall(parameters = ''): +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 install' % parameters): + if system('make %s %s' % (parameters, argument)): raise InstallError('!!! Install failed...\n') else: raise InstallError('!!! No Makefile found...\n')