summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2012-11-16 14:50:05 -0800
committerNicholas Corgan <nick.corgan@ettus.com>2012-11-16 15:53:08 -0800
commit7b1f83fd55457903b626d47f173b64714c5bff2b (patch)
tree95dbd9adea26ef37191dbb908739ef674f1174c8
parentf5a0656bf290c9caa49c341acf20034990919b12 (diff)
downloaduhd-7b1f83fd55457903b626d47f173b64714c5bff2b.tar.gz
uhd-7b1f83fd55457903b626d47f173b64714c5bff2b.tar.bz2
uhd-7b1f83fd55457903b626d47f173b64714c5bff2b.zip
utils: images downloader defaults to UHD_IMAGES_DIR instead of CMAKE_INSTALL_PREFIX
-rw-r--r--host/utils/uhd_images_downloader.py.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in
index a57f9dc48..8c8d2df81 100644
--- a/host/utils/uhd_images_downloader.py.in
+++ b/host/utils/uhd_images_downloader.py.in
@@ -38,7 +38,7 @@ if __name__ == "__main__":
#Command line options
parser = OptionParser()
- parser.add_option("--install-location", type="string", default="@CMAKE_INSTALL_PREFIX@/share/uhd/images", help="Set custom install location for images, [default=%default]")
+ parser.add_option("--install-location", type="string", default="", help="Set custom install location for images")
parser.add_option("--buffer-size", type="int", default=8192, help="Set download buffer size, [default=%default]",)
(options, args) = parser.parse_args()
@@ -52,6 +52,8 @@ if __name__ == "__main__":
#Configuring image destination
if options.install_location != "":
images_dir = options.install_location
+ elif os.environ.get("UHD_IMAGES_DIR") != "" and os.environ.get("UHD_IMAGES_DIR") != None:
+ images_dir = os.environ.get("UHD_IMAGES_DIR")
else:
images_dir = "@CMAKE_INSTALL_PREFIX@/share/uhd/images"