KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix bridge build and description, add default configure command to rules.mk, use CONFIG_ as prefix for package selction variables

Browse source 
SVN-Revision: 3690
This commit is contained in:
Felix Fietkau 2006-04-21 09:55:30 +00:00
parent ebb58643eb
commit 5606b22166
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
openwrt/package/bridge/Makefile
View file

@ -19,36 +19,18 @@ SECTION:=base
CATEGORY:=Network CATEGORY:=Network
DEFAULT:=y DEFAULT:=y
TITLE:=Ethernet bridging configuration utility 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. form a larger network.
URL:=http://bridge.sourceforge.net/ URL:=http://bridge.sourceforge.net/
endef endef
define Build/Configure define Build/Configure
$(TARGET_CONFIGURE_OPTS) \ $(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
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)
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
touch $@
endef endef
define Package/busybox/install define Package/busybox/install

25
openwrt/package/rules.mk
View file

@ -81,13 +81,13 @@ IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
ifneq ($(PACKAGE_$(1)),) ifneq ($(CONFIG_PACKAGE_$(1)),)
COMPILE_$(1):=1 COMPILE_$(1):=1
endif endif
ifneq ($(DEVELOPER),) ifneq ($(DEVELOPER),)
COMPILE_$(1):=1 COMPILE_$(1):=1
endif endif
ifeq ($(PACKAGE_$(1)),y) ifeq ($(CONFIG_PACKAGE_$(1)),y)
install-targets: $$(INFO_$(1)) install-targets: $$(INFO_$(1))
endif endif
@ -188,10 +188,29 @@ endef
define Build/Configure/Default define Build/Configure/Default
# TODO: add configurable default command # 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 endef
define Build/Configure define Build/Configure
$(call Build/Configure/Default)
endef endef
define Build/Compile/Default define Build/Compile/Default