diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-04-13 13:16:12 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-04-13 13:16:12 +0200 |
| commit | 08b5febf01700db8853ff2921247c04ecd15f344 (patch) | |
| tree | 92bc31a9dbce8d1ed6b1f6fee43be04f13deca57 /GNUmakefile | |
| parent | 0064cf575e64bf304243796cc8daf219edec5671 (diff) | |
| download | gnutls-08b5febf01700db8853ff2921247c04ecd15f344.tar.gz | |
Update gnulib files.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 38dd1262fa..0c1bc38afb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -54,13 +54,14 @@ _have-git-version-gen := \ $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes) ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) _is-dist-target = $(filter-out %clean, \ - $(filter dist% alpha beta major,$(MAKECMDGOALS))) + $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)) _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \ $(srcdir)/.tarball-version) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache && $(_autoreconf))) + _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \ + && $(_autoreconf)) endif endif endif @@ -68,11 +69,16 @@ endif else .DEFAULT_GOAL := abort-due-to-no-makefile +srcdir = . # The package can override .DEFAULT_GOAL to run actions like autoreconf. -include ./cfg.mk include ./maint.mk +ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile) +$(MAKECMDGOALS): abort-due-to-no-makefile +endif + abort-due-to-no-makefile: @echo There seems to be no Makefile in this directory. 1>&2 @echo "You must run ./configure before running \`make'." 1>&2 |