From 3c37d58f2136545116f0568227fed4dfe709d65c Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 8 Jan 2026 16:17:52 +0100 Subject: [PATCH] man: use autoconf instead of extra sed run Signed-off-by: Enrico Weigelt, metux IT consult --- .gitignore | 2 ++ configure.ac | 3 +-- man/Makefile.am | 34 ++------------------------------- man/{evdev.man => evdev.man.in} | 10 +++++----- 4 files changed, 10 insertions(+), 39 deletions(-) rename man/{evdev.man => evdev.man.in} (98%) diff --git a/.gitignore b/.gitignore index ec54d78..a728c9a 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,5 @@ core # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' # +man/evdev.4 +man/evdev.man diff --git a/configure.ac b/configure.ac index 8ec8497..322b107 100644 --- a/configure.ac +++ b/configure.ac @@ -62,5 +62,4 @@ AC_SUBST(inputdir) xorgconfdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` AC_SUBST(xorgconfdir) -AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) -AC_OUTPUT +AC_OUTPUT([Makefile src/Makefile man/Makefile man/evdev.man]) diff --git a/man/Makefile.am b/man/Makefile.am index 6191c40..55cc8d6 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,37 +1,7 @@ -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - drivermandir = $(DRIVER_MAN_DIR) - -driverman_PRE = evdev.man - -driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX)) - -EXTRA_DIST = evdev.man +driverman_DATA = evdev.$(DRIVER_MAN_SUFFIX) CLEANFILES = $(driverman_DATA) -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(DRIVER_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + cp $< $@ diff --git a/man/evdev.man b/man/evdev.man.in similarity index 98% rename from man/evdev.man rename to man/evdev.man.in index 1336b10..e7e3e7c 100644 --- a/man/evdev.man +++ b/man/evdev.man.in @@ -1,6 +1,6 @@ .\" shorthand for double quote that works everywhere. .ds q \N'34' -.TH EVDEV __drivermansuffix__ 2016-11-17 __vendorversion__ +.TH EVDEV @DRIVER_MAN_SUFFIX@ 2016-11-17 "@PACKAGE_STRING@" "X Version 11" .SH NAME evdev \- Generic Linux input driver for XLibre .SH SYNOPSIS @@ -363,7 +363,7 @@ Value range 0-32, 0 disables a value. .SH AUTHORS Kristian Høgsberg, Peter Hutterer .SH "SEE ALSO" -.BR XLibre (__appmansuffix__), -.BR xorg.conf (__filemansuffix__), -.BR Xserver (__appmansuffix__), -.BR X (__miscmansuffix__) +.BR XLibre (@APP_MAN_SUFFIX@), +.BR xorg.conf (@FILE_MAN_SUFFIX@), +.BR Xserver (@APP_MAN_SUFFIX@), +.BR X (@MISC_MAN_SUFFIX@)