From e517ccca6e7f1bd9160f2d82c10ddb618771d192 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 24 May 2010 15:50:18 -0400 Subject: [PATCH] config: use automake "dir" pattern for simplification configdir is where the config file is installed config_DATA is the filename Signed-off-by: Gaetan Nadon --- conf/Makefile.am | 3 +-- configure.ac | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/Makefile.am b/conf/Makefile.am index 9a88895..e3dbff9 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -20,8 +20,7 @@ if HAS_XORG_CONF_DIR -confdir = $(XORG_CONF_DIR) -dist_conf_DATA = 50-synaptics.conf +dist_config_DATA = 50-synaptics.conf else EXTRA_DIST = 11-x11-synaptics.fdi diff --git a/configure.ac b/configure.ac index 5c386b8..69c6ff4 100644 --- a/configure.ac +++ b/configure.ac @@ -76,9 +76,9 @@ sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` AC_ARG_WITH(xorg-conf-dir, AC_HELP_STRING([--with-xorg-conf-dir=DIR], [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), - [XORG_CONF_DIR="$withval"], - [XORG_CONF_DIR="$sysconfigdir"]) -AC_SUBST(XORG_CONF_DIR) + [configdir="$withval"], + [configdir="$sysconfigdir"]) +AC_SUBST(configdir) AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) # Define a configure option to enable code debugging