Revision: 703 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=703&view=rev Author: eht16 Date: 2009-06-11 10:10:43 +0000 (Thu, 11 Jun 2009)
Log Message: ----------- Overwrite installation prefix on Windows only if it wasn't specified explicitly. Fix DOCDIR path.
Modified Paths: -------------- trunk/geany-plugins/wscript
Modified: trunk/geany-plugins/wscript =================================================================== --- trunk/geany-plugins/wscript 2009-06-11 10:04:51 UTC (rev 702) +++ trunk/geany-plugins/wscript 2009-06-11 10:10:43 UTC (rev 703) @@ -37,7 +37,7 @@
import Build, Options, Utils, preproc -import sys, os +import os, sys, tempfile
APPNAME = 'geany-plugins' @@ -255,8 +255,9 @@ if 'geanygdb' in enabled_plugins: enabled_plugins.remove('geanygdb')
- prefix = os.path.splitdrive(conf.srcdir)[1] - conf.env['PREFIX'] = os.path.join(prefix, '%s-%s' % (APPNAME, VERSION)) + 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) # hack: we add the parent directory of the first include directory as this is missing in # list returned from pkg-config conf.env['CPPPATH_GTK'].insert(0, os.path.dirname(conf.env['CPPPATH_GTK'][0])) @@ -286,8 +287,7 @@ conf.undefine('DATADIR') else: conf.define('PREFIX', conf.env['PREFIX'], 1) - # fixme, DOCDIR is wrong - conf.define('DOCDIR', '%s/doc/geany-plugins/' % conf.env['DATADIR'], 1) + conf.define('DOCDIR', '%s/doc/geany-plugins/', 1) conf.define('VERSION', VERSION, 1) conf.define('PACKAGE', APPNAME, 1) conf.define('GETTEXT_PACKAGE', APPNAME, 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.