[jhbuild] distutils: Explicity set install directories
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] distutils: Explicity set install directories
- Date: Fri, 22 Apr 2022 16:47:31 +0000 (UTC)
commit 45892714ce2e26f5ee7e866f52b83bf9c3c5925b
Author: Patrick Griffis <pgriffis igalia com>
Date: Fri Apr 22 11:45:06 2022 -0500
distutils: Explicity set install directories
It was possible the auto-detected install directories were under an incorrect prefix.
jhbuild/modtypes/distutils.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/jhbuild/modtypes/distutils.py b/jhbuild/modtypes/distutils.py
index 99e13c96..735a60f8 100644
--- a/jhbuild/modtypes/distutils.py
+++ b/jhbuild/modtypes/distutils.py
@@ -70,11 +70,15 @@ class DistutilsModule(Package, DownloadableModule):
srcdir = self.get_srcdir(buildscript)
builddir = self.get_builddir(buildscript)
destdir = self.prepare_installroot(buildscript)
+ prefix = buildscript.config.prefix
cmd = [self.python, 'setup.py']
if srcdir != builddir:
cmd.extend(['build', '--build-base', builddir])
cmd.extend(['install',
- '--prefix', buildscript.config.prefix,
+ '--prefix', prefix,
+ '--install-script', os.path.join(prefix, 'bin'),
+ '--install-lib', os.path.join(prefix, 'bin'),
+ '--install-data', os.path.join(prefix, 'share'),
'--root', destdir])
buildscript.execute(cmd, cwd = srcdir, extra_env = self.extra_env)
self.process_install(buildscript, self.get_revision())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]