diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-14 09:34:37 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-14 09:34:37 -0700 |
| commit | 291a46b86e8e639b711a609134ace667235eeb91 (patch) | |
| tree | 51097428875ca347177b96177f963d6600993356 /host/lib/utils/paths.cpp | |
| parent | 5e8b0752a41f836f82c64a2c4e25a3786259b60e (diff) | |
| download | uhd-291a46b86e8e639b711a609134ace667235eeb91.tar.gz uhd-291a46b86e8e639b711a609134ace667235eeb91.tar.bz2 uhd-291a46b86e8e639b711a609134ace667235eeb91.zip | |
uhd: specify the UHD_PKG_DATA_PATH once (since images shipped w/ drivers)
Diffstat (limited to 'host/lib/utils/paths.cpp')
| -rw-r--r-- | host/lib/utils/paths.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index 329695873..0ddc80d6e 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -76,16 +76,12 @@ 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(LOCAL_PKG_DATA_DIR) / "images"); - if (not std::string(INSTALLER_PKG_DATA_DIR).empty()) - paths.push_back(fs::path(INSTALLER_PKG_DATA_DIR) / "images"); + paths.push_back(fs::path(UHD_PKG_DATA_PATH) / "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(LOCAL_PKG_DATA_DIR) / "modules"); - if (not std::string(INSTALLER_PKG_DATA_DIR).empty()) - paths.push_back(fs::path(INSTALLER_PKG_DATA_DIR) / "modules"); + paths.push_back(fs::path(UHD_PKG_DATA_PATH) / "modules"); return paths; } |