Make this script work again (broken since 2008-01-19).

diff --git a/ChangeLog b/ChangeLog
index f09eaa1501447a76789f858ae6645a0b5f1da077..e393de131313c6d4dc0461385851b485ee48ec32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-26  Bruno Haible  <bruno@clisp.org>
+
+       * posix-modules: Update to directory names changed on 2008-01-19.
+       Remove commas in output before splitting into words. No more need to
+       avoid 'ftruncate' since 2007-02-19.
+
 2008-09-26  Bruno Haible  <bruno@clisp.org>
 
        * doc/posix-headers/errno.texi: Remove mention of module 'EOVERFLOW'.

diff --git a/posix-modules b/posix-modules
index e6f0f356deb4590311416ad071b1fa77accd2274..80c49fe0535c114e2bc085bf3141106fbcfb2e47 100755 (executable)
--- a/posix-modules
+++ b/posix-modules
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2002-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-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
@@ -138,17 +138,14 @@ done
 
 (
   # Get the header modules.
-  LC_ALL=C grep -h '^Gnulib module: ' "$gnulib_dir"/doc/headers/* 2>/dev/null \
+  LC_ALL=C grep -h '^Gnulib module: ' "$gnulib_dir"/doc/posix-headers/* 2>/dev/null \
     | sed -e 's,^Gnulib module: ,,'
   # Get the function modules.
-  LC_ALL=C grep -h '^Gnulib module: ' "$gnulib_dir"/doc/functions/* 2>/dev/null \
+  LC_ALL=C grep -h '^Gnulib module: ' "$gnulib_dir"/doc/posix-functions/* 2>/dev/null \
     | sed -e 's,^Gnulib module: ,,'
-  # Then filter out the words "---", "and", "or" and remove *-gnu modules.
-) | LC_ALL=C sort | LC_ALL=C uniq \
+  # Then filter out the words "---", ",", "and", "or" and remove *-gnu modules.
+) | sed -e 's/,/ /g' | LC_ALL=C sort | LC_ALL=C uniq \
   | { # Then filter out the words "---", "and", "or" and remove *-gnu modules.
       tr ' ' '\012' | sed -e '/^---$/d' -e '/^and$/d' -e '/^or$/d' -e '/-gnu$/d'
     } \
-  | LC_ALL=C sort | LC_ALL=C uniq \
-  | { # Except ftruncate, which aborts the configuration on mingw. FiXME
-      sed -e '/^ftruncate$/d'
-    }
+  | LC_ALL=C sort | LC_ALL=C uniq