This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 89f1e3baa7cf7bd40ceb28d735026c3ece321293 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 07:27:14 2018 +0100 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. --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc094f7..9213dda 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 ?= -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git