From 4531a96c9a77ab225aaeb472a7c7642e2e7dcb38 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 26 May 2020 12:22:03 +0200
Subject: ci/build_libs.sh: update configure options

Remove --build and --host since they are only needed for crosscompile.
Native builds don't need those and they will not work in case someone
tries build on 32bit.

Also add envronment variables for libdir and libexecdir so the
debian/ubuntu specific lib(exec)dir can be overridden.
---
 ci/build_libs.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'ci')

diff --git a/ci/build_libs.sh b/ci/build_libs.sh
index 77d7d4d..6cedec5 100644
--- a/ci/build_libs.sh
+++ b/ci/build_libs.sh
@@ -2,9 +2,19 @@
 
 XFCE_BASE=https://gitlab.xfce.org
 
-AUTOGEN_OPTIONS="--disable-debug --enable-maintainer-mode --host=x86_64-linux-gnu
-                --build=x86_64-linux-gnu --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu
-                --libexecdir=/usr/lib/x86_64-linux-gnu --sysconfdir=/etc --localstatedir=/var --enable-gtk-doc"
+: ${libdir:="/usr/lib/x86_64-linux-gnu"}
+: ${libexecdir:="/usr/lib/x86_64-linux-gnu"}
+
+AUTOGEN_OPTIONS="
+  --disable-debug
+  --enable-maintainer-mode
+  --prefix=/usr
+  --libdir=$libdir
+  --libexecdir=$libexecdir
+  --sysconfdir=/etc
+  --localstatedir=/var
+  --enable-gtk-doc
+"
 
 # list of git repos in build order
 REPOS="${XFCE_BASE}/xfce/xfce4-dev-tools.git
-- 
cgit v1.2.1