qt5: install host tools in /usr/local/genode/tool/23.05

Issue #4868
This commit is contained in:
Christian Prochaska 2023-05-16 06:58:45 +02:00 committed by Christian Helmuth
parent c4b8fae563
commit ee9281b458
3 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@
# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) # QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core)
# #
QT_TOOLS_DIR = /usr/local/genode/qt5/23.05 QT_TOOLS_DIR = /usr/local/genode/tool/23.05
ifeq ($(filter-out $(SPECS),arm),) ifeq ($(filter-out $(SPECS),arm),)
QT_PLATFORM = genode-arm-g++ QT_PLATFORM = genode-arm-g++

View File

@ -6,7 +6,7 @@
# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) # QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core)
# #
QT_TOOLS_DIR = /usr/local/genode/qt5/23.05 QT_TOOLS_DIR = /usr/local/genode/tool/23.05
QMAKE = $(QT_TOOLS_DIR)/bin/qmake QMAKE = $(QT_TOOLS_DIR)/bin/qmake
ifeq ($(filter-out $(SPECS),arm),) ifeq ($(filter-out $(SPECS),arm),)

View File

@ -41,7 +41,7 @@ QTDECLARATIVE_DIR = $(CONTRIB_DIR)/src/lib/qtdeclarative
QTTOOLS_DIR = $(CONTRIB_DIR)/src/lib/qttools QTTOOLS_DIR = $(CONTRIB_DIR)/src/lib/qttools
TOOL_VERSION = 23.05 TOOL_VERSION = 23.05
BUILD_DIR = $(GENODE_DIR)/build/tool/qt5/$(TOOL_VERSION) BUILD_DIR = $(GENODE_DIR)/build/tool/qt5/$(TOOL_VERSION)
DEFAULT_INSTALL_LOCATION = /usr/local/genode/qt5/$(TOOL_VERSION) DEFAULT_INSTALL_LOCATION = /usr/local/genode/tool/$(TOOL_VERSION)
INSTALL_LOCATION ?= $(DEFAULT_INSTALL_LOCATION) INSTALL_LOCATION ?= $(DEFAULT_INSTALL_LOCATION)
SUDO ?= sudo SUDO ?= sudo