diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-16 23:28:37 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-16 23:28:37 -0700 |
| commit | 7d110e73e6b0651f73e8e5b165244f59e66fed87 (patch) | |
| tree | a908018a138c2567939a7193695beab7cc3f6487 /host/lib/utils/paths.cpp | |
| parent | f75869e4f7ffb53ca7f348c3a1b6d6c8fb1499b7 (diff) | |
| download | uhd-7d110e73e6b0651f73e8e5b165244f59e66fed87.tar.gz uhd-7d110e73e6b0651f73e8e5b165244f59e66fed87.tar.bz2 uhd-7d110e73e6b0651f73e8e5b165244f59e66fed87.zip | |
uhd: added the concept of installer path (along with local path) for package data
Diffstat (limited to 'host/lib/utils/paths.cpp')
| -rw-r--r-- | host/lib/utils/paths.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index 3f29945dd..6ad12d3cc 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -72,13 +72,17 @@ static std::vector<fs::path> get_env_paths(const std::string &var_name){ **********************************************************************/ std::vector<fs::path> get_image_paths(void){ std::vector<fs::path> paths = get_env_paths("UHD_IMAGE_PATH"); - paths.push_back(fs::path(FULL_PKG_DATA_DIR) / "images"); + paths.push_back(fs::path(LOCAL_PKG_DATA_DIR) / "images"); + if (not std::string(INSTALLER_PKG_DATA_DIR).empty()) + paths.push_back(fs::path(INSTALLER_PKG_DATA_DIR) / "images"); return paths; } std::vector<fs::path> get_module_paths(void){ std::vector<fs::path> paths = get_env_paths("UHD_MODULE_PATH"); - paths.push_back(fs::path(FULL_PKG_DATA_DIR) / "modules"); + paths.push_back(fs::path(LOCAL_PKG_DATA_DIR) / "modules"); + if (not std::string(INSTALLER_PKG_DATA_DIR).empty()) + paths.push_back(fs::path(INSTALLER_PKG_DATA_DIR) / "modules"); return paths; } |