build system: Remaining layout change related fixes.

This commit is contained in:
Ville Skyttä 2011-05-02 20:37:56 +03:00
parent 4632248cbb
commit a04c2b02fa
4 changed files with 4 additions and 3 deletions

View File

@ -10,7 +10,7 @@ bash_completion.sh: bash_completion.sh.in Makefile
CLEANFILES = bash_completion.sh CLEANFILES = bash_completion.sh
EXTRA_DIST = CHANGES $(sysconf_DATA) bash_completion.sh.in EXTRA_DIST = CHANGES $(sysconf_DATA) $(pkgdata_DATA) bash_completion.sh.in
install-data-hook: install-data-hook:
tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \ tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \

View File

@ -1,3 +1,4 @@
bashcompdir = $(pkgdatadir)/completions
bashcomp_DATA = abook \ bashcomp_DATA = abook \
ant \ ant \
apache2ctl \ apache2ctl \

View File

@ -1,7 +1,6 @@
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_INIT([bash-completion], [1.99]) AC_INIT([bash-completion], [1.99])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror])
AC_SUBST(bashcompdir, $pkgdatadir/completions)
AC_SUBST(compatdir, $sysconfdir/bash_completion.d) AC_SUBST(compatdir, $sysconfdir/bash_completion.d)
AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile]) AC_CONFIG_FILES([Makefile completions/Makefile helpers/Makefile test/Makefile])
AC_OUTPUT AC_OUTPUT

View File

@ -1,3 +1,4 @@
helpersdir = $(pkgdatadir)/helpers
helpers_DATA = perl helpers_DATA = perl
EXTRA_DIST = $(helpers_DATA) EXTRA_DIST = $(helpers_DATA)