diff options
| author | David Robillard <d@drobilla.net> | 2008-10-19 21:35:06 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-19 21:35:06 +0000 |
| commit | 7f985c8e381f78622c740c36b241fbd797fdd54c (patch) | |
| tree | e0284ef49aeef041328fb0ad47f6fa20313a13ec | |
| parent | 8fc2939f29dbb8a20f00212a7549954223af1389 (diff) | |
| download | patchage-7f985c8e381f78622c740c36b241fbd797fdd54c.tar.gz patchage-7f985c8e381f78622c740c36b241fbd797fdd54c.tar.bz2 patchage-7f985c8e381f78622c740c36b241fbd797fdd54c.zip | |
Use a non-conflicting name for app specific DATA_DIR.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1687 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/GladeFile.hpp | 4 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/GladeFile.hpp b/src/GladeFile.hpp index c0051f7..48a0062 100644 --- a/src/GladeFile.hpp +++ b/src/GladeFile.hpp @@ -32,13 +32,13 @@ public: std::ifstream fs(glade_filename.c_str()); if (fs.fail()) { // didn't find it, check DATA_PATH fs.clear(); - glade_filename = std::string(DATA_DIR).append("/").append(base_name).append(".glade"); + glade_filename = std::string(PATCHAGE_DATA_DIR).append("/").append(base_name).append(".glade"); fs.open(glade_filename.c_str()); if (fs.fail()) { std::ostringstream ss; ss << "Unable to find " << base_name << "glade in current directory or " - << DATA_DIR << std::endl; + << PATCHAGE_DATA_DIR << std::endl; throw std::runtime_error(ss.str()); } fs.close(); @@ -78,8 +78,8 @@ def configure(conf): conf.env['APP_INSTALL_NAME'] = Params.g_options.app_install_name conf.env['APP_HUMAN_NAME'] = Params.g_options.app_human_name - conf.define('DATA_DIR', os.path.normpath( - conf.env['PREFIX'] + '/share/' + conf.env['APP_INSTALL_NAME'])) + conf.define('PATCHAGE_DATA_DIR', os.path.normpath( + conf.env['DATADIR'] + conf.env['APP_INSTALL_NAME'])) conf.write_config_header('config.h') |