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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 66e7c28c741964172cf565b44df6accd95cdb932..43dfc4424804b4f863a2f742a8e31a0e6b4d6400 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-27  Eric Blake  <ebb9@byu.net>
+
+       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  <bruno@clisp.org>
 
        Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".
 2009-04-26  Bruno Haible  <bruno@clisp.org>
 
        Make the lib vs. lib64 recognition work on openSUSE 11 with "gcc -m32".

diff --git a/modules/maintainer-makefile b/modules/maintainer-makefile
index 492ca69bb236c09e86915193f16464a6536f557d..21c28020ecb8b86b52db7f09f8e5bf5750c5bf22 100644 (file)
--- a/modules/maintainer-makefile
+++ b/modules/maintainer-makefile
@@ -6,6 +6,8 @@ top/maint.mk
 
 Depends-on:
 gnumakefile
 
 Depends-on:
 gnumakefile

+useless-if-before-free
+vc-list-files

 
 License:
 GPLed build tool
 
 License:
 GPLed build tool

diff --git a/top/maint.mk b/top/maint.mk
index 9a683a79d1522b3da35df842dd6de6e64466251d..229b0dc3a548fd4aebfb3b2fe9978b8fa90c055f 100644 (file)
--- 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 = $(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
 
 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:
 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;  \
                $(useless_free_options)                                 \
            $$($(VC_LIST_EXCEPT)) &&                                    \
          { echo '$(ME): found useless "if" before "free" above' 1>&2;  \