timestamp: error out if fstat and lstat st_ino and st_dev are not the same

[opendoas.git] / bsd.prog.mk

diff --git a/bsd.prog.mk b/bsd.prog.mk
index 0256856ff85ca5f4c2f4dd5241f9e31fcb06ff4a..df8f51461be9ed6968433e3a7b582047d6c75589 100644 (file)
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -2,7 +2,7 @@
 
 default: ${PROG}
 
-CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP
+CFLAGS  += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP -Wno-unused-result
 
 include config.mk
 
@@ -14,18 +14,18 @@ libopenbsd.a: ${OPENBSD}
        ${AR} -r $@ $?
 
 ${PROG}: ${OBJS} libopenbsd.a
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@
+       ${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
 
@@ -42,6 +42,7 @@ clean:
        rm -f ${OBJS}
        rm -f ${OBJS:.o=.d}
        rm -f ${PROG}
+       rm -f parse.c
 
 -include ${OBJS:.o=.d} ${OPENBSD:.o=.d}