Merge pull request #8 from frgm/master

configure: fix usage() formatting & fix make install

diff --git a/bsd.prog.mk b/bsd.prog.mk
index 03dcfb8142285e0135c98347e2edf95669e64484..93032d25e3a012e82e09bacaa123c1109372a8e5 100644 (file)
--- 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
index e15e50969dfbe992c9e5a38e6938e27de3e2640c..e6a842a126ac2bced46e71b12dcc5070b7a4e1be 100755 (executable)
--- 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