aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Overbruck <administrator@duncano.de>2016-06-27 21:46:10 +0200
committerGitHub <noreply@github.com>2016-06-27 21:46:10 +0200
commit33a5cf1a72120776a43f0557d71511bc43326c50 (patch)
tree7c13cffff903409fba08098d23a5ee63a88d947d
parentc88a56ca3e159ac6782e8b44ff36a657f94d1d68 (diff)
parent7c37e228b05e21488634da336449ece27b3894b6 (diff)
downloadopendoas-33a5cf1a72120776a43f0557d71511bc43326c50.tar.gz
Merge pull request #8 from frgm/master
configure: fix usage() formatting & fix make install
-rw-r--r--bsd.prog.mk4
-rwxr-xr-xconfigure2
2 files changed, 3 insertions, 3 deletions
diff --git a/bsd.prog.mk b/bsd.prog.mk
index 03dcfb8..93032d2 100644
--- 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 e15e509..e6a842a 100755
--- 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