aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Overbruck <administrator@duncano.de>2016-05-08 21:24:28 +0200
committerDuncan Overbruck <administrator@duncano.de>2016-05-08 21:24:28 +0200
commite18b632f557e28278a1bc8e384572378ce91e000 (patch)
tree95407dc7e829a6d5d926d7b7db517da8538d0cbe
parent9972a8ee4233ba9e48f70b7d21dbf1fb395f136e (diff)
parentba41f893e86153ac1788e971ce15b5e395247874 (diff)
downloadopendoas-e18b632f557e28278a1bc8e384572378ce91e000.tar.gz
Merge pull request #4 from frgm/master
fix make install
-rw-r--r--bsd.prog.mk3
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 3 deletions
diff --git a/bsd.prog.mk b/bsd.prog.mk
index c759f72..5769588 100644
--- a/bsd.prog.mk
+++ b/bsd.prog.mk
@@ -19,7 +19,8 @@ ${PROG}: ${OBJS} libopenbsd.a
install: ${PROG} ${PAM_DOAS}
mkdir -p -m 0755 ${DESTDIR}${BINDIR}
mkdir -p -m 0755 ${DESTDIR}${PAMDIR}
- mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man{1,5}
+ 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}
diff --git a/configure b/configure
index 7328547..ea6ce79 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@ die() {
usage() {
cat <<EOF
-usage: configure [options] [settings]
+usage: configure [options]
--prefix=PREFIX installation prefix [/usr]
--exec-prefix=EPREFIX installation prefix for executable files [PREFIX]
@@ -58,7 +58,7 @@ rm -f "$CONFIG_MK"
: ${VERSION:="$(git describe --dirty --tags --long --always)"}
cat <<EOF >>$CONFIG_MK
-DESTDIR ?= /
+DESTDIR ?=
PREFIX ?= ${PREFIX:="/usr"}
EPREFIX ?= ${EPREFIX:="${PREFIX}"}
BINDIR ?= ${BINDIR:="${PREFIX}/bin"}