From: Jim Meyering <jim@meyering.net>
Date: Sat, 23 Sep 2006 16:51:53 +0000 (+0000)
Subject: * gl/modules/getloadavg.diff: New file.  Work around the way the latest
X-Git-Tag: v6.3~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c8dece8c686fb4b6102674b27ac73c46922a576;p=thirdparty%2Fcoreutils.git

* gl/modules/getloadavg.diff: New file.  Work around the way the latest
version of the getloadavg module interacts with our bootstrap script.
* bootstrap (gnulib_tool_options): Add "--local-dir gl".
---

diff --git a/ChangeLog b/ChangeLog
index 117bee3a29..228ffb1755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-23  Jim Meyering  <jim@meyering.net>
+
+	* gl/modules/getloadavg.diff: New file.  Work around the way the latest
+	version of the getloadavg module interacts with our bootstrap script.
+	* bootstrap (gnulib_tool_options): Add "--local-dir gl".
+
 2006-09-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* bootstrap: Add support for --force.
diff --git a/bootstrap b/bootstrap
index 127a3bb309..93cfd623cf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -381,6 +381,7 @@ gnulib_tool_options="\
  --m4-base $bt/m4/\
  --source-base $bt/lib/\
  --tests-base $bt/tests\
+ --local-dir gl\
 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
diff --git a/gl/modules/getloadavg.diff b/gl/modules/getloadavg.diff
new file mode 100644
index 0000000000..9f24327bb1
--- /dev/null
+++ b/gl/modules/getloadavg.diff
@@ -0,0 +1,16 @@
+Index: modules/getloadavg
+===================================================================
+RCS file: /sources/gnulib/gnulib/modules/getloadavg,v
+retrieving revision 1.13
+diff -u -p -r1.13 getloadavg
+--- modules/getloadavg	22 Sep 2006 12:47:55 -0000	1.13
++++ modules/getloadavg	23 Sep 2006 16:41:36 -0000
+@@ -14,7 +14,7 @@ stdbool
+ fcntl-safer
+ 
+ configure.ac:
+-gl_GETLOADAVG([$gl_source_base])
++gl_GETLOADAVG([lib])
+ 
+ Makefile.am:
+