aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-04-21 09:55:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-04-21 09:55:30 +0000
commit431a3f34f8900cdd087511264b9fc50f2ae48948 (patch)
treec5f5949a35a2bcebf4850df4b3ed2255c7eb6264
parent31b753b552e23d5cc26a5a2767cdfde94edaf18a (diff)
downloadupstream-431a3f34f8900cdd087511264b9fc50f2ae48948.tar.gz
upstream-431a3f34f8900cdd087511264b9fc50f2ae48948.tar.bz2
upstream-431a3f34f8900cdd087511264b9fc50f2ae48948.zip
fix bridge build and description, add default configure command to rules.mk, use CONFIG_ as prefix for package selction variables
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3690 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/bridge/Makefile24
-rw-r--r--package/rules.mk25
2 files changed, 25 insertions, 24 deletions
diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index be52b2a975..18ea1dd2ca 100644
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -19,36 +19,18 @@ SECTION:=base
CATEGORY:=Network
DEFAULT:=y
TITLE:=Ethernet bridging configuration utility
-DESCRIPTION:=Manage ethernet bridging; a way to connect networks together to\\\
+DESCRIPTION:=Ethernet bridging configuration utility\\\
+Manage ethernet bridging; a way to connect networks together to\\\
form a larger network.
URL:=http://bridge.sourceforge.net/
endef
define Build/Configure
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- --with-linux-headers=$(LINUX_DIR)
+$(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
endef
-
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)
- touch $@
endef
define Package/busybox/install
diff --git a/package/rules.mk b/package/rules.mk
index 230b9669bd..4faf9ffcd3 100644
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -81,13 +81,13 @@ IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
-ifneq ($(PACKAGE_$(1)),)
+ifneq ($(CONFIG_PACKAGE_$(1)),)
COMPILE_$(1):=1
endif
ifneq ($(DEVELOPER),)
COMPILE_$(1):=1
endif
-ifeq ($(PACKAGE_$(1)),y)
+ifeq ($(CONFIG_PACKAGE_$(1)),y)
install-targets: $$(INFO_$(1))
endif
@@ -188,10 +188,29 @@ endef
define Build/Configure/Default
# TODO: add configurable default command
+ (cd $(PKG_BUILD_DIR); \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --datadir=/usr/share \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ $(DISABLE_NLS) \
+ $(1); \
+ )
endef
define Build/Configure
-$(call Build/Configure/Default)
endef
define Build/Compile/Default