diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /sysutils/grub | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'sysutils/grub')
| -rw-r--r-- | sysutils/grub/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/grub/PLIST | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index c5636b24895..b4edb1c6a0e 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,4 +1,5 @@ -# $NetBSD: Makefile,v 1.9 2002/07/20 13:27:32 tron Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:00 jlam Exp $ +# DISTNAME= grub-0.92 CATEGORIES= sysutils @@ -12,7 +13,7 @@ ONLY_FOR_PLATFORM= *-*-i386 GNU_CONFIGURE= YES USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" @@ -28,7 +29,7 @@ CONFIGURE_ARGS+= --enable-${GRUB_NETWORK_CARD} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ - ${PREFIX}/share/doc/grub + ${PREFIX}/share/doc/grub .else PLIST_SUBST+= NETBOOT="@comment " .endif @@ -37,6 +38,7 @@ PLIST_SUBST+= NETBOOT="@comment " CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} .endif -.include "../../devel/binutils/buildlink.mk" -.include "../../devel/ncurses/buildlink.mk" +.include "../../devel/binutils/buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index 8745ac9b093..cc3ba1f64aa 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/20 13:27:33 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:01 jlam Exp $ bin/mbchk @unexec install-info --delete --info-dir=%D/info %D/info/grub.info info/grub.info |