From: mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 7 Feb 2011 13:03:54 +0000 (+0000)
Subject: [packages/qt4] qmake.mk: pass $(STAGING_DIR); override Build/Compile/Default
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=c208e1a3e6232d8be61612f8c81770160deb900f;p=packages.git

[packages/qt4] qmake.mk: pass $(STAGING_DIR); override Build/Compile/Default

git-svn-id: svn://svn.openwrt.org/openwrt/packages@25401 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk
index cf4dc2329..cee4503de 100644
--- a/Xorg/lib/qt4/files/qmake.mk
+++ b/Xorg/lib/qt4/files/qmake.mk
@@ -23,8 +23,14 @@ define Build/Configure/Qmake
 	TARGET_INCDIRS="$(TARGET_INCDIRS)" \
 	TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \
 	STAGING_DIR_HOST="$(STAGING_DIR)/../host" \
+	STAGING_DIR="$(STAGING_DIR)" \
 	qmake \
 		-spec $(QMAKE_SPECFILE) \
 		-o $(PKG_BUILD_DIR)/Makefile \
 		$(PKG_BUILD_DIR)/$(1).pro
 endef
+
+define Build/Compile/Default
+	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
+		$(1);
+endef