simplify makefile

[opendoas.git] / configure

diff --git a/configure b/configure
index 058a958ebf9fe3637f0b7e6dbdf8e1780fa29046..632c74afff96c96218522059ef611accc8a6eca0 100755 (executable)
--- a/configure
+++ b/configure
@@ -42,14 +42,6 @@ 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#*=}
@@ -89,17 +81,6 @@ cat <<! >$CONFIG_H
 
 !
 
-cat <<EOF >>$CONFIG_MK
-CURDIR   :=    .
-PREFIX   ?=    ${PREFIX}
-EPREFIX  ?=    ${EPREFIX}
-BINDIR   ?=    ${BINDIR}
-SHAREDIR ?=    ${SHAREDIR}
-MANDIR   ?=    ${MANDIR}
-SYSCONFDIR?=   ${SYSCONFDIR}
-PAMDIR   ?=    ${PAMDIR}
-EOF
-
 if [ -z "$BUILD" ]; then
        BUILD="$(uname -m)-unknown-$(uname -s | tr '[:upper:]' '[:lower:]')"
 fi
@@ -136,9 +117,34 @@ case "$OS" in
        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