# HG changeset patch # User Simon Josefsson # Date 1242048185 -7200 # Node ID 861b812ba15f4801ba8a27bf14be5e6f9cc1ce6e # Parent d0742bd1f0f8ac10de5a26d6dc72afeb665f1335 top/maint.mk: Make $(srcdir)/build-aux configurable. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-05-11 Simon Josefsson + + * top/maint.mk: Make $(srcdir)/build-aux configurable. + 2009-05-11 Eric Blake argp: avoid undefined behavior diff --git a/top/maint.mk b/top/maint.mk --- a/top/maint.mk +++ b/top/maint.mk @@ -21,6 +21,9 @@ # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) ME := maint.mk +# Override this in cfg.mk if you use a non-standard build-aux directory. +build_aux ?= $(srcdir)/build-aux + # Do not save the original name or timestamp in the .tar.gz file. # Use --rsyncable if available. gzip_rsyncable := \ @@ -32,7 +35,7 @@ VC = $(GIT) VC-tag = git tag -s -m '$(VERSION)' -u '$(gpg_key_ID)' -VC_LIST = $(srcdir)/build-aux/vc-list-files -C $(srcdir) +VC_LIST = $(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 +114,7 @@ endef sc_avoid_if_before_free: - @$(srcdir)/build-aux/useless-if-before-free \ + @$(build_aux)/useless-if-before-free \ $(useless_free_options) \ $$($(VC_LIST_EXCEPT) | grep -v useless-if-before-free) && \ { echo '$(ME): found useless "if" before "free" above' 1>&2; \ @@ -639,7 +642,7 @@ bootstrap-tools ?= autoconf,automake,gnulib announcement: NEWS ChangeLog $(rel-files) - @$(srcdir)/build-aux/announce-gen \ + @$(build_aux)/announce-gen \ --release-type=$(RELEASE_TYPE) \ --package=$(PACKAGE) \ --prev=$(PREV_VERSION) \ @@ -661,7 +664,7 @@ emit_upload_commands: @echo ===================================== @echo ===================================== - @echo "$(srcdir)/build-aux/gnupload $(GNUPLOADFLAGS) \\" + @echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\" @echo " --to $(gnu_rel_host):$(PACKAGE) \\" @echo " $(rel-files)" @echo '# send the /tmp/announcement e-mail'