diff options
author | David Robillard <d@drobilla.net> | 2008-11-29 04:06:58 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-11-29 04:06:58 +0000 |
commit | 69062548585040d7b52ce2808921bdee955814b7 (patch) | |
tree | fdae3b2e69585bef1f26eda5c683ed012db0201f | |
parent | ecca9eef020ad126f8cc95ca401356ad8e96ca57 (diff) | |
download | patchage-69062548585040d7b52ce2808921bdee955814b7.tar.gz patchage-69062548585040d7b52ce2808921bdee955814b7.tar.bz2 patchage-69062548585040d7b52ce2808921bdee955814b7.zip |
Don't use clashing options.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1825 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r-- | wscript | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -20,10 +20,12 @@ blddir = 'build' def set_options(opt): autowaf.set_options(opt) - opt.add_option('--install-name', type='string', default=APPNAME, dest='app_install_name', - help="Install name. [Default: '" + APPNAME + "']") - opt.add_option('--app-human-name', type='string', default=APP_HUMAN_NAME, dest='app_human_name', - help="Human name for app. [Default: '" + APP_HUMAN_NAME + "']") + opt.add_option('--patchage-install-name', type='string', default=APPNAME, + dest='patchage_install_name', + help="Patchage install name. [Default: '" + APPNAME + "']") + opt.add_option('--patchage-human-name', type='string', default=APP_HUMAN_NAME, + dest='patchage_human_name', + help="Patchage human name [Default: '" + APP_HUMAN_NAME + "']") opt.add_option('--jack-dbus', action='store_true', default=False, dest='jack_dbus', help="Use Jack via D-Bus [Default: False (use libjack)]") opt.add_option('--no-lash', action='store_true', default=False, dest='no_lash', @@ -76,8 +78,8 @@ def configure(conf): conf.env['PATCHAGE_VERSION'] = PATCHAGE_VERSION - conf.env['APP_INSTALL_NAME'] = Options.options.app_install_name - conf.env['APP_HUMAN_NAME'] = Options.options.app_human_name + conf.env['APP_INSTALL_NAME'] = Options.options.patchage_install_name + conf.env['APP_HUMAN_NAME'] = Options.options.patchage_human_name if conf.env['BUNDLE']: conf.define('PATCHAGE_DATA_DIR', os.path.normpath( conf.env['DATADIRNAME'] + conf.env['APP_INSTALL_NAME'])) |