summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-12-05 06:34:16 +0000
committerLaurent Bercot <ska@appnovation.com>2021-12-05 06:34:16 +0000
commite6813f40bce6ee2e569813cb712fc0b2d46b22ac (patch)
tree60086771187a08509de4027985b4a3cc30f909df
parent56bdb8ab227f0eaf75a7385ffaade4d03dbdacbf (diff)
downloaddnsfunnel-e6813f40bce6ee2e569813cb712fc0b2d46b22ac.tar.xz
configure: add var control tweak and DESTDIR support for slashpackage
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rwxr-xr-xconfigure12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index 674763c..fcd14e6 100755
--- a/configure
+++ b/configure
@@ -191,7 +191,7 @@ for arg ; do
--host=*|--target=*) target=${arg#*=} ;;
--build=*) build=${arg#*=} ;;
-* ) echo "$0: unknown option $arg" ;;
- *=*) ;;
+ *=*) eval "$arg" ;;
*) target=$arg ;;
esac
done
@@ -255,11 +255,11 @@ if $slashpackage ; then
cond=true
fi
if $cond ; then
- addincpath="$addincpath -I${sproot}${dep}/include"
- vpaths="$vpaths ${sproot}${dep}/library"
- addlibspath="$addlibspath -L${sproot}${dep}/library"
- vpathd="$vpathd ${sproot}${dep}/library.so"
- addlibdpath="$addlibdpath -L${sproot}${dep}/library.so"
+ addincpath="$addincpath -I${DESTDIR}${sproot}${dep}/include"
+ vpaths="$vpaths ${DESTDIR}${sproot}${dep}/library"
+ addlibspath="$addlibspath -L${DESTDIR}${sproot}${dep}/library"
+ vpathd="$vpathd ${DESTDIR}${sproot}${dep}/library.so"
+ addlibdpath="$addlibdpath -L${DESTDIR}${sproot}${dep}/library.so"
fi
done < package/deps-build
fi