summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-04-17 11:11:12 +0200
committerSimon Josefsson <simon@josefsson.org>2008-04-17 11:11:12 +0200
commit54ce16fb0f665284b4150d88b74d7898250c16c7 (patch)
tree42d354b7cc275879e5251aa82a27d2f1d25ce2cf /GNUmakefile
parent68cd79636c809379825aa5546743161acb3fdaa0 (diff)
downloadlibtasn1-54ce16fb0f665284b4150d88b74d7898250c16c7.tar.gz
libtasn1-54ce16fb0f665284b4150d88b74d7898250c16c7.tar.bz2
libtasn1-54ce16fb0f665284b4150d88b74d7898250c16c7.zip
Update gnulib files.
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 38dd126..0c1bc38 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