Mercurial > hg > octave-kai > gnulib-hg
changeset 11517:aad3147e3e47
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>
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Mon, 27 Apr 2009 06:27:04 -0600 |
parents | 5165bfb23649 |
children | 956eb61203ab |
files | ChangeLog modules/maintainer-makefile top/maint.mk |
diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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".
--- a/modules/maintainer-makefile +++ b/modules/maintainer-makefile @@ -6,6 +6,8 @@ Depends-on: gnumakefile +useless-if-before-free +vc-list-files License: GPLed build tool
--- a/top/maint.mk +++ b/top/maint.mk @@ -32,7 +32,7 @@ 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 @@ 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; \