summary refs log tree commit diff
path: root/extra/notify
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--extra/notify/Makefile12
-rwxr-xr-xextra/notify/configure20
2 files changed, 17 insertions, 15 deletions
diff --git a/extra/notify/Makefile b/extra/notify/Makefile
index b82094f..5e8ed93 100644
--- a/extra/notify/Makefile
+++ b/extra/notify/Makefile
@@ -1,11 +1,13 @@
 PREFIX ?= /usr/local
-MANDIR ?= ${PREFIX}/share/man
+BINDIR ?= ${PREFIX}/bin
+MANDIR ?= ${PREFIX}/man
 
 CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
-LDLIBS = -ltls
+LDADD.libtls = -ltls
 
 -include config.mk
 
+LDLIBS = ${LDADD.libtls}
 OBJS = notify.o
 
 all: pounce-notify
@@ -17,10 +19,10 @@ clean:
 	rm -f ${OBJS} pounce-notify
 
 install: pounce-notify pounce-notify.1
-	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
-	install pounce-notify ${DESTDIR}${PREFIX}/bin
+	install -d ${DESTDIR}${BINDIR} ${DESTDIR}${MANDIR}/man1
+	install pounce-notify ${DESTDIR}${BINDIR}
 	install -m 644 pounce-notify.1 ${DESTDIR}${MANDIR}/man1
 
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/pounce-notify
+	rm -f ${DESTDIR}${BINDIR}/pounce-notify
 	rm -f ${DESTDIR}${MANDIR}/man1/pounce-notify.1
diff --git a/extra/notify/configure b/extra/notify/configure
index 5a4ec45..e180aa5 100755
--- a/extra/notify/configure
+++ b/extra/notify/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,7 +33,6 @@ done
 
 case "$(uname)" in
 	(OpenBSD)
-		ldlibs -ltls
 		;;
 	(Linux)
 		cflags -D_GNU_SOURCE