Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä 2021-03-19 13:35:18 +02:00
commit 00528a0445
246 changed files with 5089 additions and 6855 deletions

View file

@ -3,11 +3,12 @@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${prefix}/@INSTALL_LIBDIR@
includedir=${prefix}/@INSTALL_INCLUDEDIR@
# those are rarely present or not at all, but we export them regardless
# its common to want to know where to install it.
plugindir=${prefix}/@INSTALL_PLUGINDIR@
# Below are rarely present or not at all, but we export them regardless
bindir=${prefix}/@INSTALL_BINDIR@
sbindir=${prefix}/@INSTALL_SBINDIR@
scriptdir=${prefix}/@INSTALL_SCRIPTDIR@
plugindir=${prefix}/@INSTALL_PLUGINDIR@
docdir=${prefix}/@INSTALL_DOCDIR@
mandir=${prefix}/@INSTALL_MANDIR@
sharedir=${prefix}/@INSTALL_SHAREDIR@