summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-24 21:12:26 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-24 21:12:26 +0000
commit51eaa39dca81819630481c2cfc955bac69ff944d (patch)
treea97c99e387aad75e39f5fd1b5798df1e8deb161f
parent5d0a9887c8f9b61615baa7832609a2ba0061cc4c (diff)
split CONFIGURE_PATH into CONFIGURE_PATH and CONFIGURE_CMD for better handling of subdirectories with configure
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6681 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-defaults.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 1316cfd32..57f5ed7ef 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -73,13 +73,14 @@ CONFIGURE_VARS = \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
CONFIGURE_PATH = .
+CONFIGURE_CMD = ./configure
define Build/Configure/Default
- (cd $(PKG_BUILD_DIR)/$(strip $(3)); \
- if [ -x $(CONFIGURE_PATH)/configure ]; then \
+ (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
+ if [ -x $(CONFIGURE_CMD) ]; then \
$(CONFIGURE_VARS) \
$(2) \
- $(CONFIGURE_PATH)/configure \
+ $(CONFIGURE_CMD) \
$(CONFIGURE_ARGS) \
$(1); \
fi; \