libindicator

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

  1. fix-disthook
  2. Merge into trunk.0.5
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 460
Merged at revision: 460
Proposed branch: lp:~charlesk/libindicator/fix-disthook
Merge into: lp:libindicator/0.5
Diff against target: 32 lines (+3/-2)
2 files modified
Makefile.am (+2/-2)
configure.ac (+1/-0)
To merge this branch: bzr merge lp:~charlesk/libindicator/fix-disthook
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+100020@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-01-13 15:09:40 +0000
3+++ Makefile.am 2012-03-29 20:24:08 +0000
4@@ -24,7 +24,7 @@
5 echo Creating ChangeLog && \
6 ( cd "$(top_srcdir)" && \
7 echo '# Generated by Makefile. Do not edit.'; echo; \
8- $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
9+ $(ac_aux_dir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
10 && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
11 || (rm -f ChangeLog.tmp; \
12 echo Failed to generate ChangeLog >&2 ); \
13@@ -36,7 +36,7 @@
14 echo Creating AUTHORS && \
15 ( cd "$(top_srcdir)" && \
16 echo '# Generated by Makefile. Do not edit.'; echo; \
17- $(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 \
18+ $(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 \
19 && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
20 || (rm -f AUTHORS.tmp; \
21 echo Failed to generate AUTHORS >&2 ); \
22
23=== modified file 'configure.ac'
24--- configure.ac 2012-03-28 21:17:33 +0000
25+++ configure.ac 2012-03-29 20:24:08 +0000
26@@ -9,6 +9,7 @@
27 AC_CONFIG_HEADERS([config.h])
28 AC_CONFIG_MACRO_DIR([m4])
29 AC_CONFIG_AUX_DIR([build-aux])
30+AC_SUBST([ac_aux_dir])
31
32 AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
33

Subscribers

People subscribed via source and target branches