diff options
| author | jlam <jlam> | 2003-01-28 22:03:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-28 22:03:00 +0000 |
| commit | d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf (patch) | |
| tree | d3bbe0e3f34c0d0b96c3bf5abf2964293c181c7b /lang | |
| parent | ebed1329682fd1c81284e9ee1632af9b987050f0 (diff) | |
| download | pkgsrc-d9bf9ebd1c4d0cf9334ca40c2f585d4d17f70bdf.tar.gz | |
Instead of including bsd.pkg.install.mk directly in a package Makefile,
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES". This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile. Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc3/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 44fb64d0d66..c5438879138 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2003/01/11 10:44:27 grant Exp $ +# $NetBSD: Makefile,v 1.53 2003/01/28 22:03:27 jlam Exp $ # Make sure that the version number in "Makefile.gcc" matches this. DISTNAME= gcc-2.95.3 @@ -19,6 +19,7 @@ PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_GMAKE= YES HAS_CONFIGURE= YES @@ -104,7 +105,6 @@ post-install: .endif .include "../../mk/texinfo.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" # Make bootstrap with compiler != gcc possible. diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index 715b2f3ca55..174e5a22ff3 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/01/11 04:31:53 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:27 jlam Exp $ # Make sure that the version number in "Makefile.gcc" matches this. DISTNAME= gcc-3.2.1 @@ -14,6 +14,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison CONFLICTS+= pgcc-[0-9]* USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_GMAKE= YES HAS_CONFIGURE= YES @@ -64,7 +65,6 @@ post-install: >> ${PLIST_SRC} .include "../../mk/texinfo.mk" -.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" # Make bootstrap with compiler != gcc possible. |