aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-25 23:10:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-25 23:10:32 +0000
commit559d2c215f8354d5c7e53c2637572d45f105dd95 (patch)
treea2e050bda5ad1834d84d4a9df4dd9a09e5831dac
parent6f2fe80b72a7acd7a064a9606d0f828f83b9d54e (diff)
downloadupstream-559d2c215f8354d5c7e53c2637572d45f105dd95.tar.gz
upstream-559d2c215f8354d5c7e53c2637572d45f105dd95.tar.bz2
upstream-559d2c215f8354d5c7e53c2637572d45f105dd95.zip
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6370 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk32
1 files changed, 19 insertions, 13 deletions
diff --git a/include/package.mk b/include/package.mk
index 84575169be..0400d08122 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -286,18 +286,7 @@ define Build/Prepare
$(call Build/Prepare/Default,)
endef
-define Build/Configure/Default
- (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 \
+CONFIGURE_ARGS := \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
@@ -313,7 +302,24 @@ define Build/Configure/Default
--localstatedir=/var \
--mandir=/usr/man \
--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); \
fi; \
)