jasper 978249c6fd - revert previous update, it breaks qgis badly, as making major changes
in a minor release is just soo cool.
- keep recently added QtWebkit and QtHelp modules
2011-01-16 17:07:05 +00:00

31 lines
977 B
Plaintext

$OpenBSD: patch-configure_py,v 1.9 2011/01/16 17:07:05 jasper Exp $
--- configure.py.orig Fri Oct 29 16:43:52 2010
+++ configure.py Sun Jan 16 16:57:10 2011
@@ -1083,6 +1083,17 @@ def run_command(cmd):
cmd is the command to run.
"""
+ try:
+ localbase = os.environ["LOCALBASE"]
+ except KeyError:
+ localbase = "/usr/local"
+ try:
+ x11base = os.environ["X11BASE"]
+ except KeyError:
+ x11base = "/usr/X11R6"
+
+ cmd = cmd.replace("${LOCALBASE}", localbase).replace("$(LOCALBASE)", localbase)
+ cmd = cmd.replace("${X11BASE}", x11base).replace("$(X11BASE)", x11base)
if opts.verbose:
sys.stdout.write(cmd + "\n")
@@ -1697,7 +1708,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
- resp = sys.stdin.readline()
+ resp = "yes"
except KeyboardInterrupt:
raise SystemExit
except: