summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-08-29 12:40:38 +0200
committerSimon Josefsson <simon@josefsson.org>2008-08-29 12:40:38 +0200
commitfdca5ec21b2c98b67d9c371caa395c119b5fa885 (patch)
tree431e4ffb678c92985ba378fa1e00c8e219a52a51
parent7cad119741607ff53e0857112d825271b644dcf0 (diff)
downloadlibtasn1-fdca5ec21b2c98b67d9c371caa395c119b5fa885.tar.gz
libtasn1-fdca5ec21b2c98b67d9c371caa395c119b5fa885.tar.bz2
libtasn1-fdca5ec21b2c98b67d9c371caa395c119b5fa885.zip
Update gnulib files.
-rw-r--r--GNUmakefile4
-rw-r--r--maint.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 7635e8d..4b4cf15 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -53,9 +53,9 @@ _autoreconf ?= autoreconf
_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, \
+ _is-dist-target ?= $(filter-out %clean, \
$(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
- _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
+ _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
ifneq (,$(_is-dist-target)$(_is-install-target))
_curr-ver := $(shell cd $(srcdir) \
&& $(_build-aux)/git-version-gen .tarball-version)
diff --git a/maint.mk b/maint.mk
index 4d74e19..24b7650 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
# This Makefile fragment is intended to be useful by any GNU-like project.
# This file originate from coreutils, CPPI, Bison, and Autoconf.
-# Copyright (C) 2001-2007 Free Software Foundation, Inc.
+# Copyright (C) 2001-2008 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,10 +21,10 @@ ME := maint.mk
# List of all C-like source code files that will be tested for
# stylistic "errors". You may want to define this to something
-# more complex in Makefile.cfg.
+# more complex in cfg.mk.
C_SOURCES ?= $(shell find . -name '*.[chly]')
-# Add some more files to check, typically set in Makefile.cfg.
+# Add some more files to check, typically set in cfg.mk.
C_SOURCES += $(C_SOURCES_ADD)
# Do not save the original name or timestamp in the .tar.gz file.