diff --git a/src/pisi/context.py b/src/pisi/context.py index 36813019..50e7c645 100644 --- a/src/pisi/context.py +++ b/src/pisi/context.py @@ -39,9 +39,9 @@ class Constants: self.c.files_dir = "files" # functions in actions_file - self.c.setup_func = "src_setup" - self.c.build_func = "src_build" - self.c.install_func = "src_install" + self.c.setup_func = "setup" + self.c.build_func = "build" + self.c.install_func = "install" def __getattr__(self, attr): return getattr(self.c, attr) diff --git a/src/samples/popt/actions.py b/src/samples/popt/actions.py index 0b149508..9375eca7 100644 --- a/src/samples/popt/actions.py +++ b/src/samples/popt/actions.py @@ -1,20 +1,16 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -#import pisi.actionsapi.gnuconfig as gnuconfig -#import pisi.actionsapi.libtoolize as libtoolize -#import pisi.actionsapi.autotools as autotools +from pisi.actionsapi import gnuconfig +from pisi.actionsapi import autotools -from pisi.actionsapi.gnuconfig import * -from pisi.actionsapi.autotools import * - -def src_setup(): - gnuconfig_update() +def setup(): + gnuconfig.gnuconfig_update() # libtoolize.libtoolize() - configure( '--with-nls' ) + autotools.configure( '--with-nls' ) -def src_build(): - make() +def build(): + autotools.make() -def src_install(): - install() +def install(): + autotools.install()