X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fpackage-defaults.mk;h=57f5ed7ef4a385bc4462f3d03821ec2c5367e24b;hb=df91d4a199216b13ddf1d7f4794d2370ce641c10;hp=3f3b33ee8b00429fb06e118fdb630069d88b0862;hpb=11817df895416f11b77a47574d0f85417d0e549c;p=openwrt-10.03%2F.git

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3f3b33ee8..57f5ed7ef 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -42,10 +42,10 @@ ifneq ($(strip $(PKG_UNPACK)),)
   endef
 endif
 
-TARGET_CPPFLAGS=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-TARGET_LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
 
-CONFIGURE_ARGS := \
+CONFIGURE_ARGS = \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -63,7 +63,7 @@ CONFIGURE_ARGS := \
 		--infodir=/usr/info \
 		$(DISABLE_NLS)
 
-CONFIGURE_VARS:= \
+CONFIGURE_VARS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
@@ -72,33 +72,36 @@ CONFIGURE_VARS:= \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
-CONFIGURE_PATH:=.
+CONFIGURE_PATH = .
+CONFIGURE_CMD = ./configure
 
 define Build/Configure/Default
-	(cd $(PKG_BUILD_DIR)/$(strip $(3)); \
-	if [ -x 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; \
 	)
 endef
 
-MAKE_VARS := \
+MAKE_VARS = \
 	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 	CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 	LDFLAGS="$(EXTRA_LDFLAGS) "
 
-MAKE_FLAGS := \
+MAKE_FLAGS = \
 	$(TARGET_CONFIGURE_OPTS) \
 	CROSS="$(TARGET_CROSS)" \
 	ARCH="$(ARCH)"
 
+MAKE_PATH = .
+
 define Build/Compile/Default
 	$(MAKE_VARS) \
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
 		$(MAKE_FLAGS) \
 		$(1);
 endef