summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-10-04 11:41:48 +0200
committerJim Meyering <meyering@redhat.com>2007-10-04 11:53:46 +0200
commit1641186cb375df291c262f680dfc4ec1b1eb7950 (patch)
treeb4626dd907430e6044b5b111c760cb7a1f219ff3
parent545cbc2cc80ee2e9f5ff75216edcfba700c3d36b (diff)
downloadcoreutils-1641186cb375df291c262f680dfc4ec1b1eb7950.tar.xz
* bootstrap (slurp): Adapt to _.h -> .in.h name change.
Signed-off-by: Jim Meyering <meyering@redhat.com>
-rw-r--r--ChangeLog2
-rwxr-xr-xbootstrap10
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ae93800ee..2d1ec4c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-10-04 Jim Meyering <jim@meyering.net>
+ * bootstrap (slurp): Adapt to _.h -> .in.h name change.
+
Remove test program: lib/t-fpending.c.
* lib/t-fpending.c: Remove file. Now, this test is in gnulib.
* lib/Makefile.am: Remove associated rules.
diff --git a/bootstrap b/bootstrap
index 295e92a3e..4b0a7b193 100755
--- a/bootstrap
+++ b/bootstrap
@@ -469,16 +469,16 @@ slurp() {
ig=$dir/$dot_ig
if test -n "$copied"; then
insert_sorted_if_absent $ig "$copied"
- # If an ignored file name ends with _.h, then also add
+ # If an ignored file name ends with .in.h, then also add
# the name with just ".h". Many gnulib headers are generated,
- # e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc.
+ # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
# Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
- f=`echo "$copied"|sed 's/_\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+ f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
insert_sorted_if_absent $ig "$f"
- # For files like sys_stat_.h and sys_time_.h, record as
+ # For files like sys_stat.in.h and sys_time.in.h, record as
# ignorable the directory we might eventually create: sys/.
- f=`echo "$copied"|sed 's/sys_.*_\.h$/sys/'`
+ f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
insert_sorted_if_absent $ig "$f"
fi
done