diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-12-05 06:34:43 +0000 |
---|---|---|
committer | Laurent Bercot <ska@appnovation.com> | 2021-12-05 06:34:43 +0000 |
commit | 966e79d264681140f9b5a3a3b6a5cf18917869e9 (patch) | |
tree | 92ca93afca1f9b2d5723c8f44656eda1d9df3139 | |
parent | 021c7cd461e1ca717f523055cc576b4ed479dd55 (diff) | |
download | s6-networking-966e79d264681140f9b5a3a3b6a5cf18917869e9.tar.xz |
configure: add var control tweak and DESTDIR support for slashpackage
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -209,7 +209,7 @@ for arg ; do --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; - *=*) ;; + *=*) eval "$arg" ;; *) target=$arg ;; esac done @@ -273,11 +273,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 |