about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-12-05 06:34:29 +0000
committerLaurent Bercot <ska@appnovation.com>2021-12-05 06:34:29 +0000
commitec88ccc01acab3766b62d130ccfb2beeb3d5bfa4 (patch)
treecd47e0fb614f0c6b0784fbdd5aecfb22ef705df4
parent502387d0d0c9f5d494beaec2275398102b684914 (diff)
downloadpamela-ec88ccc01acab3766b62d130ccfb2beeb3d5bfa4.tar.gz
pamela-ec88ccc01acab3766b62d130ccfb2beeb3d5bfa4.tar.xz
pamela-ec88ccc01acab3766b62d130ccfb2beeb3d5bfa4.zip
configure: add var control tweak and DESTDIR support for slashpackage
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rwxr-xr-xconfigure12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index f1a93c9..a6e7d23 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