Jim Meyering wrote:
Jim Meyering wrote:
> Jim Meyering wrote:
>> Hi Rich,
>>
>> Prompted by your "New commands to list devices by UUID and label"
>> patch, I've adjusted it to use gnulib.
> ...
>
> One additional patch is required, when building from scratch:
>
>>From a935ea923c434e14a4babc814db32bda1a5d3dbf Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering(a)redhat.com>
> Date: Wed, 5 Aug 2009 08:01:38 -0400
> Subject: [PATCH] build: tell bootstrap about daemon/
>
> * bootstrap: Run gnulib-tool --update in daemon/.
Here's a complete patch, relative to current HEAD.
One additional change: remove bootstrap's --gnulib-srcdir option:
>From 5e6e79972be244a3a73751461d3774c9681dd98f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Mon, 3 Aug 2009 11:44:51 +0100
Subject: [PATCH] daemon: use gnulib
Rich just mentioned on IRC that the lack of daemon/tests and
daemon/lib causes a problem. I hit that, manually created them
and promptly forgot about it. Here's a patch to make bootstrap
do the job for us:
diff --git a/bootstrap b/bootstrap
index 0f14038..aa3c5dc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -78,7 +78,7 @@ sed '
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
<$gnulib_tool || exit
-(cd daemon && $GNULIB_SRCDIR/../gnulib-tool --update)
+(cd daemon && mkdir -p tests lib && $GNULIB_SRCDIR/../gnulib-tool
--update)
modules='
gitlog-to-changelog