aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-03-29 13:32:32 -0700
committerCharles Kerr <charles.kerr@canonical.com>2012-03-29 13:32:32 -0700
commit5a839c4176325651423480b7f9770f959bf37f32 (patch)
treec9b26def67fe6dd9a995bd33c2e1de2765843a90
parent922d781acee9d4d0210f66d3be5ad6b6620ed0da (diff)
parent2eb70f478e64770084b2e5a1b05d0bbd4aeee7c5 (diff)
downloadlibayatana-indicator-5a839c4176325651423480b7f9770f959bf37f32.tar.gz
libayatana-indicator-5a839c4176325651423480b7f9770f959bf37f32.tar.bz2
libayatana-indicator-5a839c4176325651423480b7f9770f959bf37f32.zip
merge lp:~charlesk/libindicator/fix-disthook to fix auto-generation of AUTHORS and Changelog by looking for 'missing' in the directory where we told AC_CONFIG_AUX_DIR to put it.0.4.94
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 182cb2d..d8ec187 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ dist-hook:
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 @@ dist-hook:
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 ); \
diff --git a/configure.ac b/configure.ac
index 7f4c17c..21bcf67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_PREREQ([2.64])
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])