diff options
| author | jlam <jlam@pkgsrc.org> | 2003-01-29 19:34:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-01-29 19:34:14 +0000 |
| commit | 7cf1a7b253bfebbb55eb34f73dc84fa3cdcf7a88 (patch) | |
| tree | c5f2ae66dbeac06a486ba807bb1ecbc4b3f279c6 /mk | |
| parent | 026b96dbe042f0a926ae5a4e4889125f8d3890bb (diff) | |
| download | pkgsrc-7cf1a7b253bfebbb55eb34f73dc84fa3cdcf7a88.tar.gz | |
Move the inclusion of bsd.pkg.install.mk higher so that binary packages
are generated correctly (with INSTALL and DEINSTALL scripts). Fix
suggested by Stoned Elipot <seb@netbsd.org>.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 64847e4b573..791705dc283 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1135 2003/01/29 09:34:29 abs Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1136 2003/01/29 19:34:14 jlam Exp $ # # This file is in the public domain. # @@ -476,6 +476,10 @@ PLIST_SUBST+= PERL5_SITEARCH=${PERL5_SITEARCH:S/^${LOCALBASE}\///} PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///} .endif +.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS]) +. include "../../mk/bsd.pkg.install.mk" +.endif + # Set INSTALL_FILE to be the name of any INSTALL file .if !defined(INSTALL_FILE) && exists(${PKGDIR}/INSTALL) INSTALL_FILE= ${PKGDIR}/INSTALL @@ -941,10 +945,6 @@ NO_BUILDLINK= # defined . include "../../mk/buildlink2/bsd.buildlink2.mk" .endif -.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS]) -. include "../../mk/bsd.pkg.install.mk" -.endif - .MAIN: all # Use aliases, so that all versions of English are acceptable |