--- a/utils/Makefile	Wed Dec 13 06:07:40 2023 +0000
+++ b/utils/Makefile	Tue May 21 00:15:24 2024 +0000
@@ -1,11 +1,9 @@
-INSTALL_PREFIX=	/opt/themwi
-
-CC=	gcc
-CFLAGS=	-O2 -I../build-inc
+CPPFLAGS=-I../build-inc
 PROGS=	themwi-check-own themwi-dump-numdb themwi-short-dial themwi-update-numdb
 LIBNUMDB=../libnumdb/libnumdb.a
 LIBUTIL=../libnumutil/libnumutil.a
-INSTBIN=${INSTALL_PREFIX}/bin
+
+include ../config.defs
 
 all:	${PROGS}
 
@@ -13,7 +11,7 @@
 	${CC} -o $@ $@.o ${LIBNUMDB} ${LIBUTIL}
 
 themwi-dump-numdb:	themwi-dump-numdb.c
-	${CC} ${CFLAGS} -o $@ $@.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ $@.c
 
 themwi-short-dial:	themwi-short-dial.o ${LIBNUMDB} ${LIBUTIL}
 	${CC} -o $@ $@.o ${LIBNUMDB} ${LIBUTIL}
@@ -22,8 +20,8 @@
 	${CC} -o $@ $@.o ${LIBUTIL}
 
 install:
-	mkdir -p ${INSTBIN}
-	install -c -m 755 ${PROGS} ${INSTBIN}
+	mkdir -p ${DESTDIR}${bindir}
+	install -c -m 755 ${PROGS} ${DESTDIR}${bindir}
 
 clean:
 	rm -f *.o ${PROGS} errs