configure: define CURDIR for all targets

[opendoas.git] / bsd.prog.mk

diff --git a/bsd.prog.mk b/bsd.prog.mk
index 50bbcb3010e3808bc4b5f8ba9be975cfc51834f7..6441fd8e0d8dfa85c09770fcd426ba3f2d0b58f8 100644 (file)
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -2,30 +2,26 @@
 
 default: ${PROG}
 
-CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP
+CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP -Wno-unused-result
 
 include config.mk
 
-OPENBSD := $(addprefix libopenbsd/,${OPENBSD})
 OBJS    := ${SRCS:.y=.c}
 OBJS    := ${OBJS:.c=.o}
 
-libopenbsd.a: ${OPENBSD}
-       ${AR} -r $@ $?
-
-${PROG}: ${OBJS} libopenbsd.a
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@
+${PROG}: ${OBJS}
+       ${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS}
 
 install: ${PROG} ${PAM_DOAS} ${MAN}
        mkdir -p -m 0755 ${DESTDIR}${BINDIR}
-       mkdir -p -m 0755 ${DESTDIR}${PAMDIR}
+       [ -n "${PAM_DOAS}" ] && mkdir -p -m 0755 ${DESTDIR}${PAMDIR} || true
        mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man1
        mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man5
        cp -f ${PROG} ${DESTDIR}${BINDIR}
        chown ${BINOWN}:${BINGRP} ${DESTDIR}${BINDIR}/${PROG}
        chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG}
-       cp ${PAM_DOAS} ${DESTDIR}${PAMDIR}/doas
-       chmod 0644 ${DESTDIR}${PAMDIR}/doas
+       [ -n "${PAM_DOAS}" ] && cp ${PAM_DOAS} ${DESTDIR}${PAMDIR}/doas || true
+       [ -n "${PAM_DOAS}" ] && chmod 0644 ${DESTDIR}${PAMDIR}/doas || true
        cp -f doas.1 ${DESTDIR}${MANDIR}/man1
        cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
 
@@ -36,14 +32,11 @@ uninstall:
        rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
 
 clean:
-       rm -f version.h
-       rm -f libopenbsd.a
-       rm -f ${OPENBSD}
-       rm -f ${OPENBSD:.o=.d}
        rm -f ${OBJS}
        rm -f ${OBJS:.o=.d}
        rm -f ${PROG}
+       rm -f parse.c
 
--include ${OBJS:.o=.d} ${OPENBSD:.o=.d}
+-include ${OBJS:.o=.d}
 
 .PHONY: default clean install uninstall