diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py index c73c8883..09605369 100644 --- a/pisi/actionsapi/autotools.py +++ b/pisi/actionsapi/autotools.py @@ -28,6 +28,7 @@ def configure(parameters = ''): dirs.conf, dirs.localstate, parameters) + os.system(configure_string) def make(parameters = ''): @@ -43,9 +44,7 @@ def install(parameters = ''): dir_suffix = os.path.dirname(os.path.dirname(os.getcwd())) + \ glb.const.install_dir_suffix - - if not parameters: - install_string = 'make prefix=%(prefix)s/%(defaultprefix)s \ + install_string = 'make prefix=%s/%(defaultprefix)s \ datadir=%(prefix)s/%(data)s \ infodir=%(prefix)s/%(info)s \ localstatedir=%(prefix)s/%(localstate)s \ @@ -58,8 +57,16 @@ def install(parameters = ''): 'localstate': dirs.localstate, 'conf': dirs.conf, 'data': dirs.data} - else: - install_string = 'make PREFIX=%s%s install' % (dir_suffix, parameters) + + os.system(install_string) + +def installWithPrefix(parameters = ''): + dirs = glb.dirs + + dir_suffix = os.path.dirname(os.path.dirname(os.getcwd())) + \ + glb.const.install_dir_suffix + + install_string = 'make PREFIX=%s%s install' % (dir_suffix, parameters) os.system(install_string) @@ -72,3 +79,13 @@ def installWithDestdir(): install_string = 'make install DESTDIR=%s' % dir_suffix os.system(install_string) + +def installWithBasedir(): + dirs = glb.dirs + + dir_suffix = os.path.dirname(os.path.dirname(os.getcwd())) + \ + glb.const.install_dir_suffix + + install_string = 'make BASEDIR=%s install' % dir_suffix + + os.system(install_string) diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index 790e201a..3e1fc1a3 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -102,6 +102,11 @@ def dolib(filename, destination = '/lib', srcDir = ''): if os.access(libFile, os.F_OK): copy_file(libFile, env.install_dir + destination + '/' + filename) +def dodir(parameters = ''): + env = glb.env + + makedirs(env.install_dir + parameters) + def remove(filename): env = glb.env