diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-12-05 06:34:45 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-12-05 06:34:45 +0000 |
| commit | a382e6d64c6aa85d636c2a2dc508c8c9dd55d320 (patch) | |
| tree | 685f7b5a6d31864ca1dee52c8b373d172e09b039 /configure | |
| parent | a7fa07e3eed2a8b8fceaec44fc30d9a5e46145be (diff) | |
| download | s6-portable-utils-a382e6d64c6aa85d636c2a2dc508c8c9dd55d320.tar.gz s6-portable-utils-a382e6d64c6aa85d636c2a2dc508c8c9dd55d320.tar.xz s6-portable-utils-a382e6d64c6aa85d636c2a2dc508c8c9dd55d320.zip | |
configure: add var control tweak and DESTDIR support for slashpackage
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure index 34d59b4..ea5aabb 100755 --- a/configure +++ b/configure @@ -192,7 +192,7 @@ for arg ; do --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; - *=*) ;; + *=*) eval "$arg" ;; *) target=$arg ;; esac done @@ -256,11 +256,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 |