[jhbuild] substitute ${exec_prefix} in autogen.sh/configure commands



commit 4eb9a9ffcb1ab4b81cdab9089435b9043a519daf
Author: Frederic Peters <fpeters 0d be>
Date:   Sun Apr 26 13:07:10 2009 +0200

    substitute ${exec_prefix} in autogen.sh/configure commands
    
    If there is no --exec-prefix in the constructed autogen command, we
    can safely assume it will be the same as {prefix} and substitute it
    right at the moment, so the printed command can be copy/pasted
    afterwards.  (GNOME #580272)
---
 jhbuild/modtypes/autotools.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 47b99d6..4cfee31 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -193,6 +193,13 @@ class AutogenModule(Package):
                        (buildscript.config.prefix, "'\${exec_prefix}/lib64'"))
                 cmd = p.sub(r'\1\4-- \2\3', cmd)
 
+        # If there is no --exec-prefix in the constructed autogen command, we
+        # can safely assume it will be the same as {prefix} and substitute it
+        # right now, so the printed command can be copy/pasted afterwards.
+        # (GNOME #580272)
+        if not '--exec-prefix' in template:
+            cmd = cmd.replace('${exec_prefix}', buildscript.config.prefix)
+
         buildscript.execute(cmd, cwd = builddir, extra_env = self.extra_env)
     do_configure.next_state = STATE_CLEAN
     do_configure.error_states = [STATE_FORCE_CHECKOUT,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]