diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-12-05 06:34:31 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-12-05 06:34:31 +0000 |
| commit | 8f07ab35656d5ce025f8ffcce295f72a40033aa6 (patch) | |
| tree | f9a71c39effb53f0583451747c7e42408f21061f /configure | |
| parent | ded0e56eb088873c2c05589ae9ab095a573450eb (diff) | |
| download | s6-8f07ab35656d5ce025f8ffcce295f72a40033aa6.tar.gz s6-8f07ab35656d5ce025f8ffcce295f72a40033aa6.tar.xz s6-8f07ab35656d5ce025f8ffcce295f72a40033aa6.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 1dbaaba..abdb380 100755 --- a/configure +++ b/configure @@ -200,7 +200,7 @@ for arg ; do --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; - *=*) ;; + *=*) eval "$arg" ;; *) target=$arg ;; esac done @@ -264,11 +264,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 |