opendoas

commit 33a5cf1a72120776a43f0557d71511bc43326c50
parent c88a56ca3e159ac6782e8b44ff36a657f94d1d68
Author: Duncan Overbruck <administrator@duncano.de>
Date:   Mon, 27 Jun 2016 21:46:10 +0200

Merge pull request #8 from frgm/master

configure: fix usage() formatting & fix make install
Diffstat:
M
bsd.prog.mk
 | 
4
++--
M
configure
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bsd.prog.mk b/bsd.prog.mk
@@ -18,14 +18,14 @@ ${PROG}: ${OBJS} libopenbsd.a
 
 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
 
diff --git a/configure b/configure
@@ -24,7 +24,7 @@ usage: configure [options]
   --enable-debug         enable debugging
   --enable-static        prepare for static build
 
-	--without-pam          disable pam support
+  --without-pam          disable pam support
 
   --help, -h             display this help and exit
 EOF