summaryrefslogtreecommitdiff
path: root/package/fluxbox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-22 11:46:25 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-22 11:46:25 (GMT)
commit47e110abbf0d3142d737e753833d0d6239965b2a (patch)
tree84308904e286e4ad1136dd447175eaa7ec19ae09 /package/fluxbox
parent7695ce447acb41050295fd205e14ba55c378cdd2 (diff)
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.
Diffstat (limited to 'package/fluxbox')
-rw-r--r--package/fluxbox/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index 89c3df5..f583e1e 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: