diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 17:20:11 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 17:20:11 -0700 |
| commit | 6c8260dcb5c73aaef38b7473acc9a332a93c5fa5 (patch) | |
| tree | 591d0bd3a8d37120a240153881980adf65b84658 /host/lib/utils/paths.cpp | |
| parent | fa7cf1f297dc6a6d04b550f9a6211caeb0a87074 (diff) | |
| parent | 7d110e73e6b0651f73e8e5b165244f59e66fed87 (diff) | |
| download | uhd-6c8260dcb5c73aaef38b7473acc9a332a93c5fa5.tar.gz uhd-6c8260dcb5c73aaef38b7473acc9a332a93c5fa5.tar.bz2 uhd-6c8260dcb5c73aaef38b7473acc9a332a93c5fa5.zip | |
Merge branch 'next' into usrp1
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; } |