From f32592af5b7419a6402a62b40c3658cc84a46d79 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 12 Jan 2026 09:04:41 +0100 Subject: [PATCH] configure.ac: query input_drivers_dir from xlibre-server.pc Use new pkg-config name and variable for retrieving the input driver installation directory. Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 5 ++--- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 322b107..711ae50 100644 --- a/configure.ac +++ b/configure.ac @@ -55,9 +55,8 @@ PKG_CHECK_MODULES(MTDEV, mtdev) # Define a configure option for an alternate input module directory PKG_PROG_PKG_CONFIG([0.25]) -moduledir=`$PKG_CONFIG --variable=moduledir xorg-server` -inputdir=${moduledir}/input -AC_SUBST(inputdir) +xlibre_input_drivers_dir=`$PKG_CONFIG --variable=input_drivers_dir xlibre-server` +AC_SUBST(xlibre_input_drivers_dir) xorgconfdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` AC_SUBST(xorgconfdir) diff --git a/src/Makefile.am b/src/Makefile.am index 61b8ed0..26348a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ AM_CPPFLAGS =-I$(top_srcdir)/include $(LIBEVDEV_CFLAGS) evdev_drv_la_LTLIBRARIES = evdev_drv.la evdev_drv_la_LDFLAGS = -module -avoid-version evdev_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS) $(LIBEVDEV_LIBS) -evdev_drv_ladir = @inputdir@ +evdev_drv_ladir = @xlibre_input_drivers_dir@ evdev_drv_la_SOURCES = evdev.c \ evdev.h \