X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=bsd.prog.mk;h=6441fd8e0d8dfa85c09770fcd426ba3f2d0b58f8;hb=9bfe647d25e27479c391492470e31dedef366238;hp=03dcfb8142285e0135c98347e2edf95669e64484;hpb=e88a009620a604d57d85bd53b971cfa77e44315e;p=opendoas.git

diff --git a/bsd.prog.mk b/bsd.prog.mk
index 03dcfb8..6441fd8 100644
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -6,26 +6,22 @@ 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
+${PROG}: ${OBJS}
 	${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS}
 
 install: ${PROG} ${PAM_DOAS} ${MAN}
 	mkdir -p -m 0755 ${DESTDIR}${BINDIR}
-	[ -n "${PAM_DOAS}" ] && 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}
 	[ -n "${PAM_DOAS}" ] && cp ${PAM_DOAS} ${DESTDIR}${PAMDIR}/doas || true
-	[ -n "${PAM_DOAS}" ] && chmod 0644 ${DESTDIR}${PAMDIR}/doas
+	[ -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,13 +32,11 @@ uninstall:
 	rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
 
 clean:
-	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