Merge lp:~charlesk/libindicator/fix-disthook into lp:libindicator/0.5

[Charles Kerr]

Fix auto-generation of AUTHORS and Changelog by looking for `missing' in the directory where we told AC_CONFIG_AUX_DIR to put it.

[Ted Gould (ted)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-01-13 15:09:40 +0000
+++ Makefile.am	2012-03-29 20:24:08 +0000
@@ -24,7 +24,7 @@
 			echo Creating ChangeLog && \
 				( cd "$(top_srcdir)" && \
 				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+				$(ac_aux_dir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
 				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
 				|| (rm -f ChangeLog.tmp; \
 					echo Failed to generate ChangeLog >&2 ); \
@@ -36,7 +36,7 @@
 			echo Creating AUTHORS && \
 				( cd "$(top_srcdir)" && \
 				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+				$(ac_aux_dir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
 				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
 				|| (rm -f AUTHORS.tmp; \
 					echo Failed to generate AUTHORS >&2 ); \
 
=== modified file 'configure.ac'
--- configure.ac	2012-03-28 21:17:33 +0000
+++ configure.ac	2012-03-29 20:24:08 +0000
@@ -9,6 +9,7 @@
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
+AC_SUBST([ac_aux_dir])
 
 AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])