Commit 755a51f3 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecs 



In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs,
but also libraries that wish to integrate with qmake, such as
qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs,
so the easiest solution is to have a symbolic link between the two
directories, instead of copying things around.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7a4e44fc

package/qt/qt.mk

+1 −2
Original line number Diff line number Diff line
@@ -583,8 +583,7 @@ define QT_INSTALL_STAGING_CMDS 
	$(MAKE) -C $(@D) install

	mkdir -p $(HOST_DIR)/usr/bin

	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin

	rm -rf $(HOST_DIR)/usr/mkspecs

	mv $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr

	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs

	$(QT_INSTALL_QT_CONF)

endef