aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-24 21:12:26 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-24 21:12:26 +0000
commitfe42382d1ca111de88a3be087f7ee217480482a5 (patch)
treea4ac5d81d30eae991439e8d9bc04a302d0bdff1b
parentac75c5015f4d7b6bf92d612b175f5a630ed14337 (diff)
downloadupstream-fe42382d1ca111de88a3be087f7ee217480482a5.tar.gz
upstream-fe42382d1ca111de88a3be087f7ee217480482a5.tar.bz2
upstream-fe42382d1ca111de88a3be087f7ee217480482a5.zip
split CONFIGURE_PATH into CONFIGURE_PATH and CONFIGURE_CMD for better handling of subdirectories with configure
SVN-Revision: 6681
-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 1316cfd32c..57f5ed7ef4 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; \