From af676f5abd261260f0d474bfd657dd5da65946f5 Mon Sep 17 00:00:00 2001 From: Duncan Overbruck Date: Thu, 12 Nov 2020 17:02:05 +0100 Subject: [PATCH] fix portability issues with configure script --- configure | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 9eaef72..2c88379 100755 --- a/configure +++ b/configure @@ -42,6 +42,14 @@ WITHOUT_TIMESTAMP=yes UID_MAX=65535 GID_MAX=65535 +: ${PREFIX:=/usr/local} +: ${EPREFIX:=${PREFIX}} +: ${BINDIR:=${PREFIX}/bin} +: ${SHAREDIR:=${PREFIX}/share} +: ${MANDIR:=${SHAREDIR}/man} +: ${SYSCONFDIR:=/etc} +: ${PAMDIR:=${SYSCONFDIR}/pam.d} + for x; do opt=${x%%=*} var=${x#*=} @@ -82,13 +90,13 @@ cat <$CONFIG_H ! cat <>$CONFIG_MK -PREFIX ?= ${PREFIX:="/usr"} -EPREFIX ?= ${EPREFIX:="${PREFIX}"} -BINDIR ?= ${BINDIR:="${PREFIX}/bin"} -SHAREDIR ?= ${SHAREDIR:="${PREFIX}/share"} -MANDIR ?= ${MANDIR:="${SHAREDIR}/man"} -SYSCONFDIR?= ${SYSCONFDIR:="/etc"} -PAMDIR ?= ${PAMDIR:="${SYSCONFDIR}/pam.d"} +PREFIX ?= ${PREFIX} +EPREFIX ?= ${EPREFIX} +BINDIR ?= ${BINDIR} +SHAREDIR ?= ${SHAREDIR} +MANDIR ?= ${MANDIR} +SYSCONFDIR?= ${SYSCONFDIR} +PAMDIR ?= ${PAMDIR} EOF if [ -z "$BUILD" ]; then -- 2.39.2