simplify makefile

[opendoas.git] / configure

diff --git a/configure b/configure
index 9eaef721eecef2a84f19511feb7f159ad3ec38de..632c74afff96c96218522059ef611accc8a6eca0 100755 (executable)
--- a/configure
+++ b/configure
@@ -81,16 +81,6 @@ cat <<! >$CONFIG_H
 
 !
 
-cat <<EOF >>$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"}
-EOF
-
 if [ -z "$BUILD" ]; then
        BUILD="$(uname -m)-unknown-$(uname -s | tr '[:upper:]' '[:lower:]')"
 fi
@@ -123,14 +113,38 @@ case "$OS" in
                printf 'Setting GID_MAX\t\t\t\t%d.\n' "$GID_MAX" >&2
                printf '#define GID_MAX %s\n' "$GID_MAX" >>$CONFIG_H
                OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE"
-               printf 'CURDIR   :=     .\n' >>$CONFIG_MK
                ;;
        netbsd)
                OS_CFLAGS="$OS_CFLAGS -D_OPENBSD_SOURCE"
                printf 'LDFLAGS  +=     -lutil\n' >>$CONFIG_MK
+               : ${BINGRP:=wheel}
                ;;
 esac
 
+: ${PREFIX:=/usr/local}
+: ${EPREFIX:=${PREFIX}}
+: ${BINDIR:=${PREFIX}/bin}
+: ${SHAREDIR:=${PREFIX}/share}
+: ${MANDIR:=${SHAREDIR}/man}
+: ${SYSCONFDIR:=/etc}
+: ${PAMDIR:=${SYSCONFDIR}/pam.d}
+: ${BINMODE:=4755}
+: ${BINOWN:=root}
+: ${BINGRP:=root}
+
+cat <<EOF >>$CONFIG_MK
+PREFIX   ?=    ${PREFIX}
+EPREFIX  ?=    ${EPREFIX}
+BINDIR   ?=    ${BINDIR}
+SHAREDIR ?=    ${SHAREDIR}
+MANDIR   ?=    ${MANDIR}
+SYSCONFDIR?=   ${SYSCONFDIR}
+PAMDIR   ?=    ${PAMDIR}
+BINMODE  ?=    ${BINMODE}
+BINOWN  ?=     ${BINOWN}
+BINGRP  ?=     ${BINGRP}
+EOF
+
 [ -n "$OS_CFLAGS" ] && \
        printf 'CFLAGS   +=     %s\n' "$OS_CFLAGS" >>$CONFIG_MK