Re: kbuild docs regression

[Randy Dunlap]

Amerigo Wang wrote:
> On Tue, Jun 16, 2009 at 03:14:14PM +0200, Jiri Slaby wrote:
>> On 06/15/2009 06:31 PM, Randy Dunlap wrote:
>>> make htmldocs
>>> without using "O=dir" now (as of 2.6.30-git8) fails with
>>>
>>>   DOCPROC Documentation/DocBook/deviceiobook.xml
>>>   DOCPROC Documentation/DocBook/device-drivers.xml
>>> exec /scripts/kernel-doc: No such file or directory
>>> exec /scripts/kernel-doc: No such file or directory
>>> make[1]: *** [Documentation/DocBook/deviceiobook.xml] Error 1
>>>
>>> (+ more)
>>>
>>> Using V=1 shows that SRCTREE is set but KBUILD_SRC is not set:
>> Hmm, thanks, actually it's set, but it's empty :(. Is it expected, or is
>> it a build-sys bug?
> 
> No, it is a bug of docproc. Patch below fixes it.
> 
> Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>

Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>


> ---
> diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
> index 4c9523e..99ca7a6 100644
> --- a/scripts/basic/docproc.c
> +++ b/scripts/basic/docproc.c
> @@ -385,7 +385,7 @@ int main(int argc, char *argv[])
>  	if (!srctree)
>  		srctree = getcwd(NULL, 0);
>  	kernsrctree = getenv("KBUILD_SRC");
> -	if (!kernsrctree)
> +	if (!kernsrctree || !*kernsrctree)
>  		kernsrctree = srctree;
>  	if (argc != 3) {
>  		usage();


-- 
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/