Mercurial > mxe-octave

comparison Makefile.in @ 6893:caa19ef0ff93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Adjust paths for Qt6 tools in MXE_* variables. * Makefile.in: The tools for Qt6 are installed at a prefix that isn't in the search PATH by default. Adjust MXE_* variables for native build configurations so dependent packages are using the correct tools.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 01 Oct 2023 14:47:09 +0200
parents 5451bbbaf0d3
children 0d1843620df0
comparison
equal deleted inserted replaced
6892:fe46a604d08b 6893:caa19ef0ff93
391 MXE_DLLTOOL := true 391 MXE_DLLTOOL := true
392 MXE_NM := nm 392 MXE_NM := nm
393 MXE_STRIP := true 393 MXE_STRIP := true
394 MXE_WINDRES := windres 394 MXE_WINDRES := windres
395 MXE_PKG_CONFIG := pkg-config 395 MXE_PKG_CONFIG := pkg-config
396 MXE_QMAKE := qmake
397 # Although the Fortran compiler is internally gfortran, we still 396 # Although the Fortran compiler is internally gfortran, we still
398 # want to make it look like non-GNU compiler, otherwise libtool is 397 # want to make it look like non-GNU compiler, otherwise libtool is
399 # not playing nicely and trips over different variable values for 398 # not playing nicely and trips over different variable values for
400 # different configuration tags. 399 # different configuration tags.
401 HOST_AND_BUILD_CONFIGURE_OPTIONS := \ 400 HOST_AND_BUILD_CONFIGURE_OPTIONS := \
418 MXE_WINDRES := windres 417 MXE_WINDRES := windres
419 else 418 else
420 MXE_WINDRES := true 419 MXE_WINDRES := true
421 endif 420 endif
422 MXE_PKG_CONFIG := pkg-config 421 MXE_PKG_CONFIG := pkg-config
422 endif
423
424 ifeq ($(ENABLE_QT),6)
425 MXE_QMAKE := $(HOST_PREFIX)/qt6/bin/qmake
426 MXE_MOC := $(HOST_PREFIX)/qt6/libexec/moc
427 MXE_UIC := $(HOST_PREFIX)/qt6/libexec/uic
428 MXE_LRELEASE := $(HOST_PREFIX)/qt6/bin/lrelease
429 MXE_RCC := $(HOST_PREFIX)/qt6/libexec/rcc
430 else
423 MXE_QMAKE := qmake 431 MXE_QMAKE := qmake
424 endif 432 MXE_MOC := $(HOST_BINDIR)/moc
425 433 MXE_UIC := $(HOST_BINDIR)/uic
426 MXE_MOC := $(HOST_BINDIR)/moc 434 MXE_LRELEASE := $(HOST_BINDIR)/lrelease
427 MXE_UIC := $(HOST_BINDIR)/uic 435 MXE_RCC := $(HOST_BINDIR)/rcc
428 MXE_LRELEASE := $(HOST_BINDIR)/lrelease 436 endif
429 MXE_RCC := $(HOST_BINDIR)/rcc
430 437
431 MXE_MKOCTFILE := $(HOST_BINDIR)/mkoctfile 438 MXE_MKOCTFILE := $(HOST_BINDIR)/mkoctfile
432 MXE_OCTAVECONFIG := $(HOST_BINDIR)/octave-config 439 MXE_OCTAVECONFIG := $(HOST_BINDIR)/octave-config
433 else 440 else
434 MXE_TOOL_PREFIX := $(TARGET)- 441 MXE_TOOL_PREFIX := $(TARGET)-