31 lines
977 B
Plaintext
31 lines
977 B
Plaintext
$OpenBSD: patch-configure_py,v 1.6 2010/08/30 07:17:01 jasper Exp $
|
|
--- configure.py.orig Mon Jul 12 12:41:15 2010
|
|
+++ configure.py Fri Aug 27 10:35:54 2010
|
|
@@ -1061,6 +1061,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")
|
|
|
|
@@ -1674,7 +1685,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:
|