diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2017-07-05 13:14:24 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 15:22:29 +0200 |
| commit | 685f44de98caec74eefd048b01b8550b63784300 (patch) | |
| tree | be5b45caf42b2262ce85b8ef6980cc6ddcd6eca1 /package/qt | |
| parent | 3b91bd479150a599970c9121a585df9fc1566ff7 (diff) | |
| download | buildroot-685f44de98caec74eefd048b01b8550b63784300.tar.gz buildroot-685f44de98caec74eefd048b01b8550b63784300.zip | |
Globally replace $(HOST_DIR)/usr with $(HOST_DIR)
Since things are no longer installed in $(HOST_DIR)/usr, the callers
should also not refer to it.
This is a mechanical change with
git grep -l '\$(HOST_DIR)/usr' | xargs sed -i 's%\$(HOST_DIR)/usr%$(HOST_DIR)%g'
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt')
| -rw-r--r-- | package/qt/qt.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index cb1f01e1f0..d867718c47 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -598,10 +598,10 @@ QT_CONF_FILE = $(HOST_DIR)/bin/qt.conf define QT_INSTALL_QT_CONF mkdir -p $(dir $(QT_CONF_FILE)) echo "[Paths]" > $(QT_CONF_FILE) - echo "Prefix=$(HOST_DIR)/usr" >> $(QT_CONF_FILE) + echo "Prefix=$(HOST_DIR)" >> $(QT_CONF_FILE) echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE) echo "Libraries=$(STAGING_DIR)/usr/lib" >> $(QT_CONF_FILE) - echo "Data=$(HOST_DIR)/usr" >> $(QT_CONF_FILE) + echo "Data=$(HOST_DIR)" >> $(QT_CONF_FILE) echo "Binaries=$(HOST_DIR)/bin" >> $(QT_CONF_FILE) endef @@ -616,7 +616,7 @@ define QT_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install mkdir -p $(HOST_DIR)/bin mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/bin - ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs + ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/mkspecs $(QT_INSTALL_QT_CONF) for i in moc uic rcc lupdate lrelease ; do \ $(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/bin/$${i}," \ |
