From bc9f6ae120ae210c2222297666b9f7ab0c4c2f8b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 27 Aug 2012 23:26:32 +0200 Subject: setup fix --- setup.py | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 0901e74..d99e5c4 100755 --- a/setup.py +++ b/setup.py @@ -163,11 +163,26 @@ class Setup(): else: conf = self.configure(opts.opts) self.viewconf(conf) - if method == 'build': self.build (conf) - elif method == 'prebuilt': self.install (conf) - elif method == 'install': self.build (conf); self.install(conf); self.clean() - elif method == 'uninstall': self.uninstall (conf) - elif method == 'uninstall-old': self.uninstallOld(conf) + + if method == 'build': + self.build(conf) + + elif method == 'prebuilt': + self.applyDestDir(conf) + self.install(conf) + + elif method == 'install': + self.build(conf) + self.applyDestDir(conf) + self.install(conf) + self.clean() + + elif method == 'uninstall': + self.uninstall(conf) + + elif method == 'uninstall-old': + self.uninstallOld(conf) + elif not method == 'view': opts.help() @@ -793,14 +808,26 @@ class Setup(): conf['man-section-' + mansection[0]] = mansection[1] - if opts['--dest-dir'] is not None: - destdir = opts['--dest-dir'][0] + + self.destDir = None if opts['--dest-dir'] is None else opts['--dest-dir'][0] + + return conf + + + def applyDestDir(self, conf): + if self.destDir is not None: for key in conf: if conf[key] not in (None, False, True): if conf[key].startswith('/'): - conf[key] = destdir + conf[key] - - return conf + conf[key] = self.destDir + conf[key] + + + def unapplyDestDir(self, conf): + if self.destDir is not None: + for key in conf: + if conf[key] not in (None, False, True): + if conf[key].startswith(self.destDir): + conf[key] = conf[key][len(self.destDir):] -- cgit