summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-06-02 06:13:59 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-06-11 20:50:26 (GMT)
commit755a51f327d7d18f31e6b352cdd7032d2d01e35f (patch)
tree21caf1d7ee33c05266d723c399bfe785e49889eb
parent7a4e44fc9042a578cc78d1fff213491d8fb1e32f (diff)
downloadbuildroot-755a51f327d7d18f31e6b352cdd7032d2d01e35f.tar.gz
buildroot-755a51f327d7d18f31e6b352cdd7032d2d01e35f.tar.bz2
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/qt/qt.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 7e6c5dd..b751696 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -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