| @@ -1,13 +1,33 @@ | | | @@ -1,13 +1,33 @@ |
1 | $NetBSD: patch-ab,v 1.3 2006/11/03 19:22:55 joerg Exp $ | | 1 | $NetBSD: patch-ab,v 1.4 2012/02/16 18:35:02 hans Exp $ |
2 | | | 2 | |
3 | --- mk/base.mk.orig 2006-11-03 15:57:04.000000000 +0000 | | 3 | --- mk/base.mk.orig 2006-11-03 15:57:04.000000000 +0000 |
4 | +++ mk/base.mk | | 4 | +++ mk/base.mk |
5 | @@ -92,7 +92,7 @@ endif # SunOS | | 5 | @@ -38,7 +38,6 @@ ifeq (${HOST_OS}, AIX) |
| | | 6 | _OSVER := $(shell /usr/bin/uname -v) |
| | | 7 | OSVER ?= ${_OSVER} |
| | | 8 | BINGRP = system |
| | | 9 | -INSTALL = /usr/ucb/install |
| | | 10 | endif # AIX |
| | | 11 | |
| | | 12 | ifeq (${HOST_OS}, CYGWIN) |
| | | 13 | @@ -87,19 +86,17 @@ ifeq (${HOST_OS}, SunOS) |
| | | 14 | _OSVER := $(shell /bin/uname -r) |
| | | 15 | OSVER ?= ${_OSVER} |
| | | 16 | BINGRP = root |
| | | 17 | -INSTALL = /usr/ucb/install |
| | | 18 | endif # SunOS |
6 | | | 19 | |
7 | PREFIX ?= /usr/local | | 20 | PREFIX ?= /usr/local |
8 | BINDIR ?= ${PREFIX}/bin | | 21 | BINDIR ?= ${PREFIX}/bin |
9 | -MANDIR ?= ${PREFIX}/man | | 22 | -MANDIR ?= ${PREFIX}/man |
10 | +MANDIR ?= ${PREFIX}/${PKGMANDIR} | | 23 | +MANDIR ?= ${PREFIX}/${PKGMANDIR} |
11 | | | 24 | |
12 | BINOWN ?= root | | 25 | BINOWN ?= root |
13 | BINGRP ?= wheel | | 26 | BINGRP ?= wheel |
| | | 27 | BINMODE?= 755 |
| | | 28 | MANMODE?= 644 |
| | | 29 | |
| | | 30 | -INSTALL ?= /usr/bin/install |
| | | 31 | INSTALL_BIN_OPTS?= -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} |
| | | 32 | INSTALL_MAN_OPTS?= -c -o ${BINOWN} -g ${BINGRP} -m ${MANMODE} |
| | | 33 | |