From daf29255f44f5bd7128088de626d41f7ba47e07c Mon Sep 17 00:00:00 2001 From: David Paleino Date: Mon, 2 May 2011 18:43:56 +0200 Subject: [PATCH] Fix autotools to use pkgdatadir instead of redefining datadir, get rid of helpersdir. --- Makefile.am | 2 +- configure.ac | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index a41181d6..6db610bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = completions test -data_DATA = bash_completion +pkgdata_DATA = bash_completion profiledir = $(sysconfdir)/profile.d profile_DATA = bash_completion.sh diff --git a/configure.ac b/configure.ac index e4a77625..fb61bb22 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,7 @@ AC_PREREQ([2.59]) AC_INIT([bash-completion], [1.99]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror]) -AC_SUBST(datadir, $datarootdir/bash-completion) -AC_SUBST(bashcompdir, $datadir/completions) -AC_SUBST(helpersdir, $datadir/helpers) +AC_SUBST(bashcompdir, $pkgdatadir/completions) AC_SUBST(compatdir, $sysconfdir/bash_completion.d) AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile]) AC_OUTPUT