From 81f367134f8b379396864f3beb9b56c7105f59fb Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Sat, 28 Dec 2024 22:21:40 +0900 Subject: [PATCH] genkeymap: replace hardcoded path with sysconf(sub)dir --- genkeymap/Makefile.am | 1 + genkeymap/genkeymap.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/genkeymap/Makefile.am b/genkeymap/Makefile.am index abf30972..85fb6e73 100644 --- a/genkeymap/Makefile.am +++ b/genkeymap/Makefile.am @@ -3,6 +3,7 @@ EXTRA_DIST = \ readme.txt AM_CPPFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \ -I$(top_srcdir)/common AM_CFLAGS = $(X_CFLAGS) diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c index 9f0095dd..3ef71faa 100644 --- a/genkeymap/genkeymap.c +++ b/genkeymap/genkeymap.c @@ -92,8 +92,8 @@ usage(const char *programname, int status) { fprintf(stderr, "Usage: %s [ -k keycode_set] [-c comment] [-c comment...]" " out_filename\n", programname); - fprintf(stderr, "Example: %s -r evdev -c \"en-US pc104 keyboard\"" - " /etc/xrdp/km-00000409.toml\n", programname); + fprintf(stderr, "Example: %s -r evdev -c \"en-US pc104 keyboard\" " + XRDP_CFG_PATH "/km-00000409.toml\n", programname); exit(status); }