diff options
| author | kim <kim@pkgsrc.org> | 1998-08-09 20:50:57 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 1998-08-09 20:50:57 +0000 |
| commit | fccaeb0515a67881b2c67618b1561319e6f9bf56 (patch) | |
| tree | 7247d718ca4ec572e47c2cf44b75f2bb6542ac2c /net | |
| parent | 53d63ffb5b75afadab2200882af3deda8c9fd2f0 (diff) | |
| download | pkgsrc-fccaeb0515a67881b2c67618b1561319e6f9bf56.tar.gz | |
Use INSTALL_PROGRAM and INSTALL_MAN to avoid bin.bin ownerships
hardcoded in the distributed Makefile. Use INSTALL_DATA instead
of INSTALL_MAN to install the ${PREFIX}/share/doc/bing/README file.
Diffstat (limited to 'net')
| -rw-r--r-- | net/bing/Makefile | 7 | ||||
| -rw-r--r-- | net/bing/patches/patch-aa | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/net/bing/Makefile b/net/bing/Makefile index c66465d3116..06a71950b4a 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1998/06/22 12:58:34 agc Exp $ +# $NetBSD: Makefile,v 1.7 1998/08/09 20:50:57 kim Exp $ # FreeBSD Id: Makefile,v 1.2 1997/10/13 09:14:49 tg Exp # @@ -8,12 +8,15 @@ MASTER_SITES= ftp://ftp.ibp.fr/pub/networking/ MAINTAINER= packages@netbsd.org +MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" +MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" + .include "../../mk/bsd.prefs.mk" post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/bing - ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/bing + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bing .endif .include "../../mk/bsd.pkg.mk" diff --git a/net/bing/patches/patch-aa b/net/bing/patches/patch-aa index 1d192d70548..dde3e654dcc 100644 --- a/net/bing/patches/patch-aa +++ b/net/bing/patches/patch-aa @@ -1,23 +1,22 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:37 agc Exp $ - ---- Makefile 1997/11/19 15:48:32 1.1 -+++ Makefile 1997/11/19 15:50:33 -@@ -1,8 +1,8 @@ +--- Makefile.orig Thu Jul 20 20:03:30 1995 ++++ Makefile Sun Aug 9 16:44:41 1998 +@@ -1,9 +1,8 @@ # # Makefile,v 1.4 1995/07/21 00:03:30 pb Exp # -MANDIR=/usr/local/man -BINDIR=/usr/local/bin +-INSTALL=install -c +MANDIR=${PREFIX}/man +BINDIR=${PREFIX}/bin - INSTALL=install -c GROFF=groff NROFF=nroff -@@ -28,5 +28,5 @@ + RM=/bin/rm +@@ -28,5 +27,5 @@ $(RM) -f bing bing.ps bing.0 install: bing bing.8 - $(INSTALL) -m 644 -o man -g man bing.8 $(MANDIR)/man8 - $(INSTALL) -m 4555 -o root -g staff bing $(BINDIR) -+ $(INSTALL) -m 644 -o bin -g bin bing.8 $(MANDIR)/man8 -+ $(INSTALL) -m 4555 -o root -g bin bing $(BINDIR) ++ $(INSTALL_MAN) bing.8 $(MANDIR)/man8 ++ $(INSTALL_PROGRAM) bing $(BINDIR) |