diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-12-05 06:34:41 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-12-05 06:34:41 +0000 |
| commit | d870f22a8550bf3a65626092a648439c1985c4c9 (patch) | |
| tree | 1ae81d95aff3e8b0c370d5747621b762ef03ed07 | |
| parent | 12cf0d180e17354774128682da8ec0dad42f72c2 (diff) | |
| download | s6-linux-utils-d870f22a8550bf3a65626092a648439c1985c4c9.tar.gz s6-linux-utils-d870f22a8550bf3a65626092a648439c1985c4c9.tar.xz s6-linux-utils-d870f22a8550bf3a65626092a648439c1985c4c9.zip | |
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
diff --git a/configure b/configure index b54c325..0f076c3 100755 --- a/configure +++ b/configure @@ -196,7 +196,7 @@ for arg ; do --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; - *=*) ;; + *=*) eval "$arg" ;; *) target=$arg ;; esac done @@ -260,11 +260,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 |