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

SVN-Revision: 25401

diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk
index cf4dc2329dbd14a9d24a35cbbfa87b5e1656dfe2..cee4503deaf5fac31d96e0a6e616376843c50cef 100644 (file)
--- 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" \
        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
        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