From: Svyatoslav Mishyn <juef@openmailbox.org>
Date: Sun, 8 May 2016 19:10:01 +0000 (+0300)
Subject: fix make install
X-Git-Tag: v0.1~4^2
X-Git-Url: https://git.armaanb.net/?p=opendoas.git;a=commitdiff_plain;h=ba41f893e86153ac1788e971ce15b5e395247874

fix make install

  man{1,5} is not expanded

set default DESTDIR to an empty string
  `mkdir -p //usr/bin` - it creates dir, but looks not very nice

also remove "[settings]" from configure usage
---

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"}