diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-05-10 16:37:20 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-05-10 16:37:20 +0200 |
| commit | f6177d2adb9540134bf7e760fd7df4599e98a713 (patch) | |
| tree | 2d191a6184884bcb85316cd9074bfe54473b592c /Makefile | |
| parent | d94e9ba24b6b02c44d0c8086631d9cddd01c952a (diff) | |
| parent | 453edbd21032ed51bba08e7368ed3ee5c45430d3 (diff) | |
| download | nx-libs-f6177d2adb9540134bf7e760fd7df4599e98a713.tar.gz nx-libs-f6177d2adb9540134bf7e760fd7df4599e98a713.tar.bz2 nx-libs-f6177d2adb9540134bf7e760fd7df4599e98a713.zip | |
Merge branch 'uli42-pr/short_font_code' into 3.6.x
Attributes GH PR #795: https://github.com/ArcticaProject/nx-libs/pull/795
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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)" |