configdir is where the config file is installed dist_config_DATA lists the filename
Signed-off-by: Gaetan Nadon <[email protected]> --- 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 30e55c9..ab138f5 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -1,6 +1,5 @@ if HAS_XORG_CONF_DIR -xorgconfdir = $(XORG_CONF_DIR) -dist_xorgconf_DATA = 50-wacom.conf +dist_config_DATA = 50-wacom.conf else fdidir = $(datadir)/hal/fdi/policy/20thirdparty dist_fdi_DATA = wacom.fdi diff --git a/configure.ac b/configure.ac index c21f585..35f6f54 100644 --- a/configure.ac +++ b/configure.ac @@ -90,9 +90,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"]) DRIVER_NAME=wacom -- 1.6.0.4 ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
