diff options
Diffstat (limited to 'attoconf/lib')
-rw-r--r-- | attoconf/lib/install.py | 12 | ||||
-rw-r--r-- | attoconf/lib/make.py | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/attoconf/lib/install.py b/attoconf/lib/install.py index b32ebe0..85e0de5 100644 --- a/attoconf/lib/install.py +++ b/attoconf/lib/install.py @@ -186,9 +186,17 @@ class Install(ClassyProject): return super(Install, cls).slots() + ( 'package', 'package_name') - def set_package(self, package, name): + # Compatibility with configure written for attoconf < 0.7 + # In attoconf 1.0, the positional srcdir argument will go away, + # the None default and the .set_package function will be removed. + # (Note: when bisecting, always force checkout attoconf!) + def __init__(self, srcdir, package=None, package_name=None, **kwargs): + super(Install, self).__init__(srcdir=srcdir, **kwargs) + self.set_package(package, package_name) + + def set_package(self, package, package_name): self.package = package - self.package_name = name + self.package_name = package_name def general(self): super(Install, self).general() diff --git a/attoconf/lib/make.py b/attoconf/lib/make.py index 8bcd3b5..c63cb61 100644 --- a/attoconf/lib/make.py +++ b/attoconf/lib/make.py @@ -65,10 +65,14 @@ class Make(ClassyProject): def slots(cls): return super(Make, cls).slots() + ('make_in', 'make_out') - def __init__(self, srcdir): - super(Make, self).__init__(srcdir) - self.set_make_infile('Makefile.in') - self.set_make_outfile('Makefile') # relative to build dir + # compatibility with attoconf < 0.7 + def __init__(self, srcdir, + make_infile='Makefile.in', + make_outfile='Makefile', + **kwargs): + super(Make, self).__init__(srcdir=srcdir, **kwargs) + self.set_make_infile(make_infile) + self.set_make_outfile(make_outfile) # relative to build dir def set_make_infile(self, ipath): self.make_in = ipath |