diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-12-05 06:34:48 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-12-05 06:34:48 +0000 |
| commit | 5b8ad01bb09e4dfaa0c5922d9434c50a64791b73 (patch) | |
| tree | b78d17ea7c26eac58ed6372f08868bf6a91992a9 | |
| parent | ebf2f9dffc704e69bc9fec981299d62a02742701 (diff) | |
| download | s6-rc-5b8ad01bb09e4dfaa0c5922d9434c50a64791b73.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
@@ -195,7 +195,7 @@ for arg ; do --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; - *=*) ;; + *=*) eval "$arg" ;; *) target=$arg ;; esac done @@ -259,11 +259,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 |