uhd: specify the UHD_PKG_DATA_PATH once (since images shipped w/ drivers)

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;
 }