d1e698bf47
While at it, patch configure to substitute $(LOCALBASE) and ${LOCALBASE}
in Makefile fragments that were never intended to run as shell-scripts
31 lines
976 B
Plaintext
31 lines
976 B
Plaintext
$OpenBSD: patch-configure_py,v 1.4 2010/04/19 09:51:30 espie Exp $
|
|
--- configure.py.orig Wed Mar 17 19:29:19 2010
|
|
+++ configure.py Mon Apr 19 11:45:31 2010
|
|
@@ -1060,6 +1060,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")
|
|
|
|
@@ -1670,7 +1681,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:
|