Kaydet (Commit) ed63abb8 authored tarafından Enrico Tröger's avatar Enrico Tröger

Overwrite installation prefix on Windows only if it wasn't specified explicitly.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3858 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst 41c95ee9
......@@ -2,6 +2,9 @@
* waf:
Update Waf to 1.5.7.
* wscript:
Overwrite installation prefix on Windows only if it wasn't
specified explicitly.
2009-06-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
......
......@@ -40,7 +40,7 @@ Requires WAF 1.5.3 and Python 2.4 (or later).
import Build, Configure, Options, Utils
import sys, os, shutil
import sys, os, shutil, tempfile
from distutils import version
......@@ -200,8 +200,9 @@ def configure(conf):
# Windows specials
if is_win32:
prefix = os.path.splitdrive(conf.srcdir)[1]
conf.define('PREFIX', os.path.join(prefix, '%s-%s' % (APPNAME, VERSION)), 1)
if conf.env['PREFIX'] == tempfile.gettempdir():
# overwrite default prefix on Windows (tempfile.gettempdir() is the Waf default)
conf.define('PREFIX', os.path.join(conf.srcdir, '%s-%s' % (APPNAME, VERSION)), 1)
conf.define('DOCDIR', os.path.join(conf.env['PREFIX'], 'doc'), 1)
conf.define('LOCALEDIR', os.path.join(conf.env['PREFIX'], 'share\locale'), 1)
conf.define('LIBDIR', conf.env['PREFIX'], 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment