From ba41f893e86153ac1788e971ce15b5e395247874 Mon Sep 17 00:00:00 2001 From: Svyatoslav Mishyn Date: Sun, 8 May 2016 22:10:01 +0300 Subject: [PATCH] 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 --- bsd.prog.mk | 3 ++- configure | 4 ++-- 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 <>$CONFIG_MK -DESTDIR ?= / +DESTDIR ?= PREFIX ?= ${PREFIX:="/usr"} EPREFIX ?= ${EPREFIX:="${PREFIX}"} BINDIR ?= ${BINDIR:="${PREFIX}/bin"} -- 2.39.2