From: Michael Orlitzky <michael@orlitzky.com>
Date: Sun, 3 Dec 2023 14:59:37 +0000 (-0500)
Subject: Makefile.am,configure.ac,doc/README: always install the Xmodmap file
X-Git-Url: http://gitweb.michael.orlitzky.com/?p=emacs-keys.git;a=commitdiff_plain;h=a510b9d181729f95702b35fc25a843431d9b53a2

Makefile.am,configure.ac,doc/README: always install the Xmodmap file

This file is small, and harmless even on systems that don't have X.
Let's not overcomplicate the build system any longer.
---

diff --git a/Makefile.am b/Makefile.am
index dacdaae..5be51c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,7 @@ EXTRA_DIST = doc src
 consoledir = $(pkgdatadir)
 nodist_console_DATA = $(srcdir)/src/console.map
 
-if XMODMAP
-  # Without this set, we won't try to install the Xmodmap file.
-  xmodmapdir = $(pkgdatadir)
-  nodist_xmodmap_DATA = $(srcdir)/src/Xmodmap
-endif
+xmodmapdir = $(pkgdatadir)
+nodist_xmodmap_DATA = $(srcdir)/src/Xmodmap
 
 nodist_doc_DATA = $(srcdir)/doc/README
diff --git a/configure.ac b/configure.ac
index f33d094..bc3928d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,18 +1,6 @@
 AC_INIT([emacs-keys], [0.0.2], [michael@orlitzky.com])
 AM_INIT_AUTOMAKE([-Wall foreign no-dist-gzip dist-xz])
 
-# --enable-Xmodmap flag, disabled by default, that decides whether or
-# not we install the Xmodmap file.
-AC_ARG_ENABLE(
-	[Xmodmap],
-	[  --enable-Xmodmap    install the Xmodmap file [[default=no]]],
-	[case "${enableval}" in
-    yes) xmodmap=true ;;
-    no)  xmodmap=false ;;
-    *) AC_MSG_ERROR([bad value ${enableval} for --enable-xmodmap]) ;;
-  esac],[xmodmap=false])
-  AM_CONDITIONAL([XMODMAP], [test x$xmodmap = xtrue])
-
 # List of output files.
 AC_CONFIG_FILES([Makefile])
 
diff --git a/doc/README b/doc/README
index d05e600..6f7e68c 100644
--- a/doc/README
+++ b/doc/README
@@ -31,9 +31,6 @@ The files:
    should be fed into the "xmodmap" utility that is part of X.org
    and which is provided by x11-apps/xmodmap on Gentoo.
 
-   You must pass "--enable-Xmodmap" to the ./configure script to
-   install this file.
-
 
 == Installation ==
 
@@ -43,12 +40,10 @@ live; for example,
   $ loadkeys /path/to/console.map
   $ xmodmap /path/to/Xmodmap
 
-The Makefile will install console.map to $(datadir)/emacs-keys by
-default. If you pass "--enable-Xmodmap" to the ./configure script,
-then the Makefile will install Xmodmap to the same location.
-
-For the Xmodmap file, that's about as good as it gets. To use it, you
-will typically add something like the following to your ~/.xinitrc,
+The build system will install these files to $(datadir)/emacs-keys by
+default. For the Xmodmap file, that's about as good as it gets. To use
+it, you will typically add something like the following to your
+~/.xinitrc,
 
   emacsmodmap=/usr/share/emacs-keys/Xmodmap
   if [ -f $emacsmodmap ]; then