hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move configure args to CONFIGURE_ARGS and configure variable to CONFIGURE_VARS to make it possible to modify the configure command line without overriding the default template 

SVN-Revision: 6370
owl
Felix Fietkau 2007-02-25 23:10:32 +00:00
parent 9b46161c67
commit d9639dd98c
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/package.mk
View File

@ -286,18 +286,7 @@ define Build/Prepare
$(call Build/Prepare/Default,) $(call Build/Prepare/Default,)
endef endef
define Build/Configure/Default CONFIGURE_ARGS := \
(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
if [ -x configure ]; then \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
$(2) \
$(PKG_CONFIGURE_PATH)/configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
@ -313,7 +302,24 @@ define Build/Configure/Default
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/man \ --mandir=/usr/man \
--infodir=/usr/info \ --infodir=/usr/info \
$(DISABLE_NLS) \ $(DISABLE_NLS)
CONFIGURE_VARS:= \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
if [ -x configure ]; then \
$(CONFIGURE_VARS) \
$(2) \
$(PKG_CONFIGURE_PATH)/configure \
$(CONFIGURE_ARGS) \
$(1); \ $(1); \
fi; \ fi; \
) )