From 15fc0376d00a2bc017f17cc68f32430ea28b3caf Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Thu, 23 Apr 2015 06:30:46 +0000
Subject: [PATCH] Use - instead of to allow that SITE is not set.
---
tools/modelsim/set_modelsim | 8 ++++----
tools/quartus/set_quartus | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/modelsim/set_modelsim b/tools/modelsim/set_modelsim
index 358a2634da..2bb2680fcb 100755
--- a/tools/modelsim/set_modelsim
+++ b/tools/modelsim/set_modelsim
@@ -32,10 +32,10 @@
export TOOLSET=${1:-}
echo "Make Modelsim and Altera library simulation settings for RadioHDL with :"
echo " - Tool setting: ${TOOLSET}"
-echo " - Site setting: ${SITE}"
+echo " - Site setting: ${SITE-}"
# Select tool version
-if [ "${SITE}" = "USN" ]; then
+if [ "${SITE-}" = "USN" ]; then
if [ "${TOOLSET}" = "unb1" ]; then
. ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1sp2
. ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6d
@@ -58,8 +58,8 @@ else # default site
else
echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
exit 1
- fi # "${TOOLSET}"
-fi # "${SITE}"
+ fi
+fi
diff --git a/tools/quartus/set_quartus b/tools/quartus/set_quartus
index 6248db37d4..53ff0d2cd2 100755
--- a/tools/quartus/set_quartus
+++ b/tools/quartus/set_quartus
@@ -32,10 +32,10 @@
TOOLSET=${1:-}
echo "Make Quartus settings for RadioHDL with :"
echo " - Tool setting: ${TOOLSET}"
-echo " - Site setting: ${SITE}"
+echo " - Site setting: ${SITE-}"
# Select tool version
-if [ "${SITE}" = "USN" ]; then
+if [ "${SITE-}" = "USN" ]; then
if [ "${TOOLSET}" = "unb1" ]; then
. ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1sp2
elif [ "${TOOLSET}" = "unb2" ]; then
@@ -53,7 +53,7 @@ else # default site
echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
exit 1
fi
-fi # "${SITE}"
+fi
# Tool settings
. ${RADIOHDL}/tools/quartus/quartus_generic.sh
--
GitLab