From 91967fb1965e4d9b8df97ab7b017ee99a6912efb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 22 Feb 2010 13:51:17 +0100
Subject: [PATCH] COMP: compiling setSet directly (without Allwmake) now works
---
.../utilities/mesh/manipulation/setSet/Allwmake | 10 ++++++----
.../utilities/mesh/manipulation/setSet/Make/options | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake
index 1e116a3315f..ef0a5739519 100755
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@@ -1,15 +1,17 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
-READLINE=0
if [ -f /usr/include/readline/readline.h ]
then
echo "Found readline/readline.h -- enabling readline support."
- READLINE=1
+ export READLINE=1
export READLINELINK="-lreadline -lncurses"
- break
+else
+ # no readline/readline.h -- disabling readline support
+ export READLINE=0
+ unset READLINELINK
fi
-export READLINE
+
wmake
# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/manipulation/setSet/Make/options b/applications/utilities/mesh/manipulation/setSet/Make/options
index dcb1b5910c2..d56c2b57f71 100644
--- a/applications/utilities/mesh/manipulation/setSet/Make/options
+++ b/applications/utilities/mesh/manipulation/setSet/Make/options
@@ -1,5 +1,7 @@
+/* NB: trailing zero after define improves robustness */
+
EXE_INC = \
- -DREADLINE=$(READLINE) \
+ -DREADLINE=$(READLINE)0 \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
--
GitLab