Skip to content

Commit

Permalink
Honor INSTALL_MAN in configure and during install
Browse files Browse the repository at this point in the history
Patch from Leonardo Taccari <leot at netbsd dot org>; thanks!
  • Loading branch information
mptre committed Mar 2, 2019
1 parent 8c56f54 commit 869536f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ install: ${PROG}
@mkdir -p ${DESTDIR}${PREFIX}/bin
${INSTALL} ${PROG} ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${MANDIR}/man1
${INSTALL} ${.CURDIR}/pick.1 ${DESTDIR}${MANDIR}/man1
${INSTALL_MAN} ${.CURDIR}/pick.1 ${DESTDIR}${MANDIR}/man1
.PHONY: install

test: ${PROG}
Expand Down
8 changes: 6 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,16 @@ CC=$(makevar CC)
CFLAGS=$(makevar CFLAGS)
CFLAGS="${CFLAGS} ${DEBUG} -Wall -Wextra -MD -MP"
INSTALL=$(makevar INSTALL)
INSTALL_MAN=$(makevar INSTALL_MAN)

: "${CPPFLAGS:=}"
: "${DEBUG:=}"
: "${INSTALL:=install}"
: "${LDFLAGS:=}"

: "${PREFIX:=/usr/local}"
: "${MANDIR:=${PREFIX}/man}"
: "${INSTALL:=install}"
: "${INSTALL_MAN:=install -m 444}"

exec 3>&1 4>&2
exec 1>config.log 2>&1
Expand Down Expand Up @@ -223,10 +226,11 @@ CC= $(echo $CC)
CFLAGS= $(echo $CFLAGS)
CPPFLAGS= $(echo $CPPFLAGS)
DEBUG= $(echo $DEBUG)
INSTALL= $(echo $INSTALL)
LDFLAGS= $(echo $LDFLAGS)
MALLOC_OPTIONS= $(echo $MALLOC_OPTIONS)
PREFIX?= $(echo $PREFIX)
MANDIR?= $(echo $MANDIR)
INSTALL?= $(echo $INSTALL)
INSTALL_MAN?= $(echo $INSTALL_MAN)
EOF

0 comments on commit 869536f

Please sign in to comment.