diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-25 23:10:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-25 23:10:32 +0000 |
| commit | d9639dd98ca5441a671941ca5052f35a9b2ad8cd (patch) | |
| tree | de6aab404c7011197191af96b6898902a92b0a03 | |
| parent | 9b46161c675b484b72fa4e47cf9b6f142f6dd31c (diff) | |
| download | master-31e0f0ae-d9639dd98ca5441a671941ca5052f35a9b2ad8cd.tar.gz master-31e0f0ae-d9639dd98ca5441a671941ca5052f35a9b2ad8cd.tar.bz2 master-31e0f0ae-d9639dd98ca5441a671941ca5052f35a9b2ad8cd.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
SVN-Revision: 6370
| -rw-r--r-- | include/package.mk | 32 |
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; \ ) |