From 47e110abbf0d3142d737e753833d0d6239965b2a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 22 Jun 2010 13:46:25 +0200
Subject: fix package names and package flavour dependencies

ipkg does not allow package names with uppercase, so revert
some of phil changes.
dependency handling of package flavours were broken, because
of a chicken and egg problem. implement a new variable (PKGFS_XXX)
containing flavour dependent package dependencies.
---
 package/fluxbox/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'package/fluxbox/Makefile')

diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index 89c3df5ed..f583e1edd 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:=		x11
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		libXpm
 ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
-PKG_DEPENDS+=		imlib2
 PKG_BUILDDEP+=		imlib2
 endif
 PKG_URL:=		http://www.fluxbox.org
@@ -20,6 +19,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
 PKG_FLAVOURS:=		WITH_IMLIB2
 PKGFD_WITH_IMLIB2:=	enable imlib2 support
+PKGFS_WITH_IMLIB2:=	imlib2
 
 include $(TOPDIR)/mk/package.mk
 
@@ -28,8 +28,7 @@ $(eval $(call PKG_template,FLUXBOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P
 ifeq (${ADK_PACKAGE_FLUXBOX_WITH_IMLIB2},y)
 CONFIGURE_ARGS+=	--enable-imlib2
 else
-#CONFIGURE_ARGS+=	--disable-imlib2
-CONFIGURE_ARGS+=	--enable-imlib2
+CONFIGURE_ARGS+=	--disable-imlib2
 endif
 
 post-install:
-- 
cgit v1.2.3