Revision: 3858 http://geany.svn.sourceforge.net/geany/?rev=3858&view=rev Author: eht16 Date: 2009-06-11 09:48:09 +0000 (Thu, 11 Jun 2009)

Log Message: ----------- Overwrite installation prefix on Windows only if it wasn't specified explicitly.

Modified Paths: -------------- trunk/ChangeLog trunk/wscript

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-11 09:11:31 UTC (rev 3857) +++ trunk/ChangeLog 2009-06-11 09:48:09 UTC (rev 3858) @@ -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>

Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-06-11 09:11:31 UTC (rev 3857) +++ trunk/wscript 2009-06-11 09:48:09 UTC (rev 3858) @@ -40,7 +40,7 @@

import Build, Configure, Options, Utils -import sys, os, shutil +import sys, os, shutil, tempfile from distutils import version

@@ -200,8 +200,9 @@

# 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)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.