diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-12-05 06:34:35 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-12-05 06:34:35 +0000 |
| commit | 5ce37689ba590ebc783eff9bd1849e2884622c60 (patch) | |
| tree | ccb81f5f310bcc65ae8af02985ddee7b2b528572 | |
| parent | f4b877ee81bc0968fea8ba4f9cd27b0c4dbdce63 (diff) | |
| download | s6-frontend-5ce37689ba590ebc783eff9bd1849e2884622c60.tar.gz s6-frontend-5ce37689ba590ebc783eff9bd1849e2884622c60.tar.xz s6-frontend-5ce37689ba590ebc783eff9bd1849e2884622c60.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 5a3d667..7abdfa0 100755 --- a/configure +++ b/configure @@ -208,7 +208,7 @@ for arg ; do --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; -* ) echo "$0: unknown option $arg" ;; - *=*) ;; + *=*) eval "$arg" ;; *) target=$arg ;; esac done @@ -272,11 +272,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 |