aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-11-10 07:27:14 +0100
committerMihai Moldovan <ionic@ionic.de>2018-11-10 07:33:00 +0100
commit89f1e3baa7cf7bd40ceb28d735026c3ece321293 (patch)
tree70e766df5ddd7be5ae6e80c0a322d9525c6bce9d
parenta12ab412db661c9139bf95570a4f4250b31759a0 (diff)
downloadnx-libs-89f1e3baa7cf7bd40ceb28d735026c3ece321293.tar.gz
nx-libs-89f1e3baa7cf7bd40ceb28d735026c3ece321293.tar.bz2
nx-libs-89f1e3baa7cf7bd40ceb28d735026c3ece321293.zip
Makefile: support systems without xkbcomp.pc.
(Very) old SLE versions don't have that file at all and we can do without - we'll just use the previous, default values. This also means that we don't need to preinstall a package containing xkbcomp.pc on Debian and derivates for the cleaning target.
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fc094f703..9213dda9c 100644
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,19 @@ IMAKE_FONT_DEFINES ?= $(shell pkg-config --modversion xfont2 1>/dev/null 2>/dev/
XEXT_EXTRA_DEFINES ?= $(shell pkg-config --exists 'xextproto < 7.1.0' 1>/dev/null 2>/dev/null && echo "-DLEGACY_XEXT_PROTO")
# check if the xkbcomp devel pkg is available - we need it for the next step
+HAS_XKBCOMP_DEVEL="yes"
ifneq ($(shell pkg-config --exists xkbcomp && echo yes), yes)
- $(error required xkbcomp devel package missing)
+ $(warning xkbcomp devel package missing, using default values)
+ HAS_XKBCOMP_DEVEL="no"
endif
# the system's directory with the xkb data files (this needs to be
# independent of Imake's ProjectRoot or the configure prefix.)
+ifeq ($(HAS_XKBCOMP_DEVEL),yes)
XKB_SYS_DEFINES ?= -DSystemXkbConfigDir=$(shell pkg-config xkbcomp --variable=xkbconfigdir) -DSystemXkbBinDir=$(shell pkg-config xkbcomp --variable=prefix)/bin
+else
+XKB_SYS_DEFINES ?= -DSystemXkbConfigDir=/usr/share/X11/xkb -DSystemXkbBinDir=/usr/bin
+endif
IMAKE_DEFINES ?=