From 78a16245a4bbf13acf53768064d81cbaa28c0d8b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Tue, 23 Apr 2019 18:22:45 +0200 Subject: 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. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') 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)" -- cgit v1.2.3