[bug-diffutils] administrivia: 3 patches

[Jim Meyering]

FYI,

>From 70a02578aebbc3f0fd6edea240d5c1e9e76101e3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 8 Apr 2010 11:02:32 +0200
Subject: [PATCH 1/2] maint: update to latest gnulib

* cfg.mk (sc_cross_check_PATH_usage_in_tests): Remove rule,
now that it's in gnulib's maint.mk.
* gnulib: Update to latest.
---
 cfg.mk |   20 --------------------
 gnulib |    2 +-
 2 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 338bed8..fcebfab 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -62,23 +62,3 @@ config-save:
        mkdir -p $(_cf_state_dir)/$(_date_time)
        ln -nsf $(date_time) $(_cf_state_dir)/latest
        cp lib/config.h config.status $(_cf_state_dir)/latest
-
-# If tests/help-version exists and seems to be new enough, assume that its
-# use of init.sh and path_prepend_ is correct, and ensure that every other
-# use of init.sh is identical.
-# This is useful because help-version cross-checks prog --version
-# with $(VERSION), which verifies that its path_prepend_ invocation
-# sets PATH correctly.  This is an inexpensive way to ensure that
-# the other init.sh-using tests also get it right.
-_hv_file = $(srcdir)/tests/help-version
-_hv_regex = ^ *\. [^ ]*/init\.sh
-sc_cross_check_PATH_usage_in_tests:
-       @if grep -l 'VERSION mismatch' $(_hv_file) >/dev/null           \
-           && grep -lE '$(_hv_regex)' $(_hv_file) >/dev/null; then     \
-         good=$$(grep -E '$(_hv_regex)' < $(_hv_file));                \
-         grep -LFx "$$good"                                            \
-               $$(grep -lE '$(_hv_regex)' $$($(VC_LIST_EXCEPT)))       \
-             | grep . &&                                               \
-           { echo "$(ME): the above files use path_prepend_ inconsistently" \
-               1>&2; exit 1; } || :;                                   \
-       fi
diff --git a/gnulib b/gnulib
index 7b9c5e7..177f525 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 7b9c5e771671ab35d3aa9e73bc064595925f345d
+Subproject commit 177f5256e8632718eb5d2bb6aecb3f9eec614baf
--
1.7.1.rc0.239.g8b27e


>From 4065b154b0eda7aa100bcd0a905b0f4304fbacfd Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 8 Apr 2010 11:04:15 +0200
Subject: [PATCH 2/2] build: include cfg.mk and dist-check.mk in the 
distribution tarball

* Makefile.am (EXTRA_DIST): Add cfg.mk and dist-check.mk.
---
 .gitignore  |    2 +-
 Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c9bd29..b5c2b2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,11 +23,11 @@
 /gnulib-tests/locale/
 /gnulib-tests/uniwidth/
 /lib/.gitignore
+/lib/c++defs.h
 /lib/charset.alias
 /lib/config.h
 /lib/config.hin
 /lib/configmake.h
-/lib/c++defs.h
 /lib/stamp-h1
 /lib/uniwidth
 /lib/warn-on-use.h
diff --git a/Makefile.am b/Makefile.am
index 0f0e0ac..9d86cb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@

 ALL_RECURSIVE_TARGETS =

-EXTRA_DIST = bootstrap exgettext ChangeLog-2008
+EXTRA_DIST = bootstrap exgettext ChangeLog-2008 cfg.mk dist-check.mk
 SUBDIRS = lib src tests doc man po ms gnulib-tests

 ACLOCAL_AMFLAGS = -I m4
--
1.7.1.rc0.239.g8b27e