Clean up Makefiles, configure scripts

Default MANDIR to ${PREFIX}/man since it turns out man-db includes
/usr/local/man by default. Add support for BINDIR. Separate libs
out into LDADD variables.

1 files changed, 11 insertions, 13 deletions

diff --git a/configure b/configure
index 4384104..a39e76e 100755
--- a/configure
+++ b/configure
@@ -4,27 +4,28 @@ set -eu
 cflags() {
 	echo "CFLAGS += $*"
 }
-ldlibs() {
-	echo "LDLIBS ${o:-}= $*"
-	o=+
-}
-config() {
-	pkg-config --print-errors "$@"
-	cflags $(pkg-config --cflags "$@")
-	ldlibs $(pkg-config --libs "$@")
-}
 defstr() {
 	cflags "-D'$1=\"$2\"'"
 }
 defvar() {
 	defstr "$1" "$(pkg-config --variable=$3 $2)${4:-}"
 }
+ldadd() {
+	lib=$1; shift
+	echo "LDADD.${lib} = $*"
+}
+config() {
+	pkg-config --print-errors "$@"
+	cflags $(pkg-config --cflags "$@")
+	for lib; do ldadd $lib $(pkg-config --libs $lib); done
+}
 
 exec >config.mk
 
 for opt; do
 	case "${opt}" in
 		(--prefix=*) echo "PREFIX = ${opt#*=}" ;;
+		(--bindir=*) echo "BINDIR = ${opt#*=}" ;;
 		(--mandir=*) echo "MANDIR = ${opt#*=}" ;;
 		(*) echo "warning: unsupported option ${opt}" >&2 ;;
 	esac
@@ -32,18 +33,16 @@ done
 
 case "$(uname)" in
 	(FreeBSD)
-		ldlibs -lcrypt
 		config libtls
 		defstr OPENSSL_BIN /usr/bin/openssl
 		defstr CERTBOT_PATH /usr/local/etc/letsencrypt
 		;;
 	(OpenBSD)
-		ldlibs -ltls
+		ldadd crypt ''
 		defstr OPENSSL_BIN /usr/bin/openssl
 		;;
 	(Linux)
 		cflags -D_GNU_SOURCE
-		ldlibs -lcrypt
 		config libtls
 		defvar OPENSSL_BIN openssl exec_prefix /bin/openssl
 		;;
@@ -54,7 +53,6 @@ case "$(uname)" in
 		defvar OPENSSL_BIN openssl exec_prefix /bin/openssl
 		;;
 	(*)
-		ldlibs -lcrypt
 		config libtls
 		defvar OPENSSL_BIN openssl exec_prefix /bin/openssl
 		;;