summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-03-07 17:40:06 +0000
committerDavid Robillard <d@drobilla.net>2009-03-07 17:40:06 +0000
commitb0a2ef7d89c4a5eacdc98082d7242a87bf65e19b (patch)
tree17c89ba2a44c9822260060553c6f41ccc0394022
parentc4473f1c4262d83f66f8ea83ecb60da5eb88da4e (diff)
downloadingen-b0a2ef7d89c4a5eacdc98082d7242a87bf65e19b.tar.gz
ingen-b0a2ef7d89c4a5eacdc98082d7242a87bf65e19b.tar.bz2
ingen-b0a2ef7d89c4a5eacdc98082d7242a87bf65e19b.zip
Fix path stuff.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1947 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--wscript18
1 files changed, 9 insertions, 9 deletions
diff --git a/wscript b/wscript
index 0b36c96c..32747935 100644
--- a/wscript
+++ b/wscript
@@ -53,15 +53,15 @@ def configure(conf):
conf.define('BUILD_INGEN_GUI', int(build_gui))
conf.define('HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1))
if conf.env['BUNDLE']:
- conf.define('INGEN_DATA_DIR', os.path.normpath(
- conf.env['DATADIRNAME'] + 'ingen'))
- conf.define('INGEN_MODULE_DIR', os.path.normpath(
- conf.env['LIBDIRNAME'] + 'ingen'))
+ conf.define('INGEN_DATA_DIR', os.path.join(
+ conf.env['DATADIRNAME'], 'ingen'))
+ conf.define('INGEN_MODULE_DIR', os.path.join(
+ conf.env['LIBDIRNAME'], 'ingen'))
else:
- conf.define('INGEN_DATA_DIR', os.path.normpath(
- conf.env['DATADIR'] + 'ingen'))
- conf.define('INGEN_MODULE_DIR', os.path.normpath(
- conf.env['LIBDIR'] + 'ingen'))
+ conf.define('INGEN_DATA_DIR', os.path.join(
+ conf.env['DATADIR'], 'ingen'))
+ conf.define('INGEN_MODULE_DIR', os.path.join(
+ conf.env['LIBDIR'], 'ingen'))
conf.write_config_header('wafconfig.h')
@@ -101,6 +101,6 @@ def build(bld):
icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48']
for s in icon_sizes:
bld.install_as(
- os.path.normpath(bld.env['DATADIR'] + '/icons/hicolor/' + s + '/apps/ingen.png'),
+ os.path.join(bld.env['DATADIR'], 'icons', 'hicolor', 'apps', 'ingen.png'),
'icons/' + s + '/ingen.png')