From 5d7f96e8d2519eb790d63ebe954b8ad985efa3df Mon Sep 17 00:00:00 2001 From: ahoka Date: Mon, 17 Aug 2009 14:21:42 +0000 Subject: Dont include options.mk from Makefile.common, but from Makefile. --- audio/cmus/Makefile | 5 +++-- audio/cmus/Makefile.common | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'audio') diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index bb7a7af4bb3..3a6c933ecd5 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/06/07 12:31:43 ahoka Exp $ +# $NetBSD: Makefile,v 1.19 2009/08/17 14:21:42 ahoka Exp $ # DISTNAME= cmus-2.2.0 @@ -13,4 +13,5 @@ COMMENT= Cmus is a curses based music player with a lot of features CONFLICTS+= cmus-unofficial-[0-9]* -.include "../cmus/Makefile.common" +.include "options.mk" +.include "../cmus/Makefile.common" \ No newline at end of file diff --git a/audio/cmus/Makefile.common b/audio/cmus/Makefile.common index 9128feb9751..4e3112adecb 100644 --- a/audio/cmus/Makefile.common +++ b/audio/cmus/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2009/06/07 12:31:43 ahoka Exp $ +# $NetBSD: Makefile.common,v 1.2 2009/08/17 14:21:42 ahoka Exp $ # PKG_DESTDIR_SUPPORT= user-destdir @@ -27,8 +27,7 @@ PLIST.sunaudio= yes CONFIGURE_ARGS+= CONFIG_SUN=n .endif -.include "../cmus/options.mk" - .include "../../mk/dlopen.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" + -- cgit v1.2.3