From 3262ad571e1c6dbfde5e7350e2d5745d59b72fcb Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 27 Apr 2009 06:27:04 -0600 Subject: [PATCH] maintainer-makefile: depend on all required helper scripts * modules/maintainer-makefile (Depends-on): Add vc-list-files and useless-if-before-free. * top/maint.mk (VC_LIST, sc_avoid_if_before_free): Use local version, rather than assuming gnulib checkout is available. Reported by Simen Josefsson. Signed-off-by: Eric Blake --- ChangeLog | 9 +++++++++ modules/maintainer-makefile | 2 ++ top/maint.mk | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66e7c28c7..43dfc4424 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-04-27 Eric Blake + + maintainer-makefile: depend on all required helper scripts + * modules/maintainer-makefile (Depends-on): Add vc-list-files and + useless-if-before-free. + * top/maint.mk (VC_LIST, sc_avoid_if_before_free): Use local + version, rather than assuming gnulib checkout is available. + Reported by Simen Josefsson. + 2009-04-26 Bruno Haible Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32". diff --git a/modules/maintainer-makefile b/modules/maintainer-makefile index 492ca69bb..21c28020e 100644 --- a/modules/maintainer-makefile +++ b/modules/maintainer-makefile @@ -6,6 +6,8 @@ top/maint.mk Depends-on: gnumakefile +useless-if-before-free +vc-list-files License: GPLed build tool diff --git a/top/maint.mk b/top/maint.mk index 9a683a79d..229b0dc3a 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -32,7 +32,7 @@ GIT = git VC = $(GIT) VC-tag = git tag -s -m '$(VERSION)' -u '$(gpg_key_ID)' -VC_LIST = $(gnulib_dir)/build-aux/vc-list-files -C $(srcdir) +VC_LIST = $(srcdir)/build-aux/vc-list-files -C $(srcdir) VC_LIST_EXCEPT = \ $(VC_LIST) | if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; else grep -v ChangeLog; fi @@ -111,7 +111,7 @@ define _prohibit_regexp endef sc_avoid_if_before_free: - @$(gnulib_dir)/build-aux/useless-if-before-free \ + @$(srcdir)/build-aux/useless-if-before-free \ $(useless_free_options) \ $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found useless "if" before "free" above' 1>&2; \ -- 2.11.0