diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 17:16:54 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 17:16:54 +0000 |
| commit | 1aa1404ebb59594a8c81b31f9b56ad35bd832a26 (patch) | |
| tree | 5de014f592095c659e0e90f2264925210817df6c /host/lib/utils/paths.cpp | |
| parent | 1b47702245f0c1f4dda3e0eff487bbe664d48855 (diff) | |
| parent | 7d110e73e6b0651f73e8e5b165244f59e66fed87 (diff) | |
| download | uhd-1aa1404ebb59594a8c81b31f9b56ad35bd832a26.tar.gz uhd-1aa1404ebb59594a8c81b31f9b56ad35bd832a26.tar.bz2 uhd-1aa1404ebb59594a8c81b31f9b56ad35bd832a26.zip | |
Merge branch 'next' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e_merge
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 9ac20d855..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(UHD_INSTALL_PREFIX) / UHD_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(UHD_INSTALL_PREFIX) / UHD_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; } |