aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-04-23 18:22:45 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-05-10 16:24:03 +0200
commit78a16245a4bbf13acf53768064d81cbaa28c0d8b (patch)
treec01c2c6f365fff1d02cc178841bc31eb6e8c2ec9 /Makefile
parent898f04e4293ce9cf7fcab810e8b27404cf0b6fde (diff)
downloadnx-libs-78a16245a4bbf13acf53768064d81cbaa28c0d8b.tar.gz
nx-libs-78a16245a4bbf13acf53768064d81cbaa28c0d8b.tar.bz2
nx-libs-78a16245a4bbf13acf53768064d81cbaa28c0d8b.zip
auto-determine system font path and add to list of font paths
This will help on non-supported platforms as it will add a path the current code might not be aware of.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 898e52474..42f9f25b4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,9 @@ CONFIGURE ?= ./configure --prefix="$(PREFIX)"
ifneq ($(shell pkg-config --exists xkbcomp && echo yes), yes)
$(warning xkbcomp devel package missing, using imake default values)
endif
+ifneq ($(shell pkg-config --exists fontutil && echo yes), yes)
+ $(warning fontutil devel package missing, using imake default values)
+endif
IMAKE_DEFINES ?=
@@ -112,6 +115,8 @@ imakeconfig:
(pkg-config --exists xkbcomp && echo "#define SystemXkbConfigDir `pkg-config xkbcomp --variable=xkbconfigdir`"; :) >>nx-X11/config/cf/nxconfig.def
(pkg-config --exists xkbcomp && echo "#define SystemXkbBinDir `pkg-config xkbcomp --variable=prefix`/bin"; :) >>nx-X11/config/cf/nxconfig.def
+ (pkg-config --exists fontutil && echo "#define SystemFontRootDir `pkg-config fontutil --variable=fontrootdir`"; :) >>nx-X11/config/cf/nxconfig.def
+
# let's create the nx-X11 Makefiles now, once everything has been defined
$(MAKE) -j1 -C nx-X11 Makefiles IMAKE_DEFINES="$(IMAKE_DEFINES)"