From b82ffa68a6436ce3f4c4b480bc9c12ac284b0d99 Mon Sep 17 00:00:00 2001
From: Duncan Overbruck <mail@duncano.de>
Date: Thu, 12 Nov 2020 17:22:54 +0100
Subject: [PATCH] simplify makefile

---
 bsd.prog.mk => GNUmakefile | 24 +++++++++++----------
 Makefile                   | 16 --------------
 configure                  | 44 ++++++++++++++++++++++----------------
 3 files changed, 38 insertions(+), 46 deletions(-)
 rename bsd.prog.mk => GNUmakefile (75%)
 delete mode 100644 Makefile

diff --git a/bsd.prog.mk b/GNUmakefile
similarity index 75%
rename from bsd.prog.mk
rename to GNUmakefile
index 6441fd8..cc64429 100644
--- a/bsd.prog.mk
+++ b/GNUmakefile
@@ -1,13 +1,18 @@
-# Copyright 2015 Nathan Holstein
+PROG=	doas
+MAN=	doas.1 doas.conf.5
 
-default: ${PROG}
-
-CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP -Wno-unused-result
+SRCS=	parse.y doas.c env.c
 
 include config.mk
 
-OBJS    := ${SRCS:.y=.c}
-OBJS    := ${OBJS:.c=.o}
+CFLAGS+= -I. -Ilibopenbsd ${COPTS}
+COPTS+=	-Wall -Wextra -Werror -pedantic
+YFLAGS=
+
+all: ${PROG}
+
+OBJS:=	${SRCS:.y=.c}
+OBJS:=	${OBJS:.c=.o}
 
 ${PROG}: ${OBJS}
 	${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS}
@@ -32,11 +37,8 @@ uninstall:
 	rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
 
 clean:
-	rm -f ${OBJS}
-	rm -f ${OBJS:.o=.d}
-	rm -f ${PROG}
-	rm -f parse.c
+	rm -f ${PROG} ${OBJS} ${OBJS:.o=.d} parse.c
 
 -include ${OBJS:.o=.d}
 
-.PHONY: default clean install uninstall
+.PHONY: all clean install uninstall
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c0ddb1a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$OpenBSD: Makefile,v 1.9 2014/01/13 01:41:00 tedu Exp $
-
-SRCS=	parse.y doas.c env.c
-
-PROG=	doas
-MAN=	doas.1 doas.conf.5
-
-BINOWN= root
-BINGRP= root
-BINMODE=4755
-
-CFLAGS+= -I${CURDIR}
-COPTS+=	-Wall -Wextra -Werror -pedantic
-YFLAGS=
-
-include bsd.prog.mk
diff --git a/configure b/configure
index 058a958..632c74a 100755
--- 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
 
-- 
2.39.2