mirror of
https://github.com/X11Libre/xf86-input-libinput.git
synced 2026-03-24 01:24:04 +00:00
Revert "drop xorg-libinput.pc"
Apperently we cannot do this, because there are software which uses xorg-libinput.pc in build system: * KDE plasma-desktop uses for libinput-properties.h header detection * LXQT uses for libinput-properties.h Closes: https://github.com/X11Libre/xf86-input-libinput/issues/25 Signed-off-by: Tautvis <gtautvis@gmail.com>
This commit is contained in:
committed by
Enrico Weigelt
parent
3d80bbef34
commit
868a03004e
@@ -27,6 +27,9 @@ DISTCHECK_CONFIGURE_FLAGS = --with-xorg-module-dir='$${libdir}/xorg/modules' \
|
||||
SUBDIRS = src include man test
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xorg-libinput.pc
|
||||
|
||||
dist_xorgconf_DATA = conf/40-libinput.conf
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
@@ -153,5 +153,5 @@ AC_CONFIG_FILES([Makefile
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
test/Makefile
|
||||
])
|
||||
xorg-libinput.pc])
|
||||
AC_OUTPUT
|
||||
|
||||
13
meson.build
13
meson.build
@@ -5,6 +5,7 @@ project('xf86-input-libinput', 'c',
|
||||
|
||||
driver_version = meson.project_version().split('.')
|
||||
|
||||
dir_pkgconf = get_option('prefix') / get_option('libdir') / 'pkgconfig'
|
||||
dir_man4 = get_option('prefix') / get_option('mandir') / 'man4'
|
||||
|
||||
cc = meson.get_compiler('c')
|
||||
@@ -123,6 +124,18 @@ test_draglock = executable('test-draglock',
|
||||
install: false)
|
||||
test('test-draglock', test_draglock)
|
||||
|
||||
|
||||
conf_pkgconf = configuration_data()
|
||||
conf_pkgconf.set('PACKAGE_VERSION', meson.project_version())
|
||||
conf_pkgconf.set('sdkdir', dir_headers)
|
||||
|
||||
configure_file(
|
||||
input: 'xorg-libinput.pc.in',
|
||||
output: 'xorg-libinput.pc',
|
||||
configuration: conf_pkgconf,
|
||||
install_dir: dir_pkgconf,
|
||||
)
|
||||
|
||||
config_man = configuration_data()
|
||||
config_man.set('VERSION', '@0@ @1@'.format(meson.project_name(), meson.project_version()))
|
||||
|
||||
|
||||
6
xorg-libinput.pc.in
Normal file
6
xorg-libinput.pc.in
Normal file
@@ -0,0 +1,6 @@
|
||||
sdkdir=@sdkdir@
|
||||
|
||||
Name: xorg-libinput
|
||||
Description: X.Org libinput input driver.
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${sdkdir}
|
||||
Reference in New Issue
Block a user