[PATCH] docs: Fix docs output after commit 6592bf6

[PATCH] docs: Fix docs output after commit 6592bf6

[Julien Grall]

A find option was forgotten in commit 6592bf60beaf1fa0b4fd36fb73800eb001c739af
"docs: Look for documentation in sub-directories" resulting to get some
docs duplicated and other missing.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
---
 docs/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 0ee6808..272292c 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -10,9 +10,9 @@ DOC_ARCHES      := arm x86_32 x86_64
 MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print))
 MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print))
 
-MAN5SRC-y := $(sort $(shell find man 'xl*.pod.5' -print))
+MAN5SRC-y := $(sort $(shell find man -name 'xl*.pod.5' -print))
 
-MARKDOWNSRC-y := $(sort $(shell find misc '*.markdown' -print))
+MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print))
 
 TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print))
 
-- 
2.1.4

Re: [PATCH] docs: Fix docs output after commit 6592bf6

[Andrew Cooper]

On 30/06/15 13:22, Julien Grall wrote:
> A find option was forgotten in commit 6592bf60beaf1fa0b4fd36fb73800eb001c739af
> "docs: Look for documentation in sub-directories" resulting to get some
> docs duplicated and other missing.
>
> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> ---
>  docs/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/docs/Makefile b/docs/Makefile
> index 0ee6808..272292c 100644
> --- a/docs/Makefile
> +++ b/docs/Makefile
> @@ -10,9 +10,9 @@ DOC_ARCHES      := arm x86_32 x86_64
>  MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print))
>  MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print))
>  
> -MAN5SRC-y := $(sort $(shell find man 'xl*.pod.5' -print))
> +MAN5SRC-y := $(sort $(shell find man -name 'xl*.pod.5' -print))

All of the sources should look for *.pod.1 and *.pod.5, without being
more specific about an xl or a xenstore prefix.

They were only like that because of limitations with the older
$(wildcard ...) invocation.

~Andrew

>  
> -MARKDOWNSRC-y := $(sort $(shell find misc '*.markdown' -print))
> +MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print))
>  
>  TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print))
>  

Re: [PATCH] docs: Fix docs output after commit 6592bf6

[Julien Grall]

Hi Andrew,

On 30/06/15 13:35, Andrew Cooper wrote:
> On 30/06/15 13:22, Julien Grall wrote:
>> A find option was forgotten in commit 6592bf60beaf1fa0b4fd36fb73800eb001c739af
>> "docs: Look for documentation in sub-directories" resulting to get some
>> docs duplicated and other missing.
>>
>> Signed-off-by: Julien Grall <julien.grall@citrix.com>
>> ---
>>  docs/Makefile | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/docs/Makefile b/docs/Makefile
>> index 0ee6808..272292c 100644
>> --- a/docs/Makefile
>> +++ b/docs/Makefile
>> @@ -10,9 +10,9 @@ DOC_ARCHES      := arm x86_32 x86_64
>>  MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print))
>>  MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print))
>>  
>> -MAN5SRC-y := $(sort $(shell find man 'xl*.pod.5' -print))
>> +MAN5SRC-y := $(sort $(shell find man -name 'xl*.pod.5' -print))
> 
> All of the sources should look for *.pod.1 and *.pod.5, without being
> more specific about an xl or a xenstore prefix.
> 
> They were only like that because of limitations with the older
> $(wildcard ...) invocation.

What kind of limitations? Similar pattern were used to match markdown
and txt.

In anycase, the patch which replaced wildcard by find retains the same
behavior. Changing the pattern is not a bug and should be part of a
separate patch.

Feel free to send a follow-up.

Regards,

-- 
Julien Grall

Re: [PATCH] docs: Fix docs output after commit 6592bf6

[Ian Jackson]

Julien Grall writes ("Re: [Xen-devel] [PATCH] docs: Fix docs output after commit 6592bf6"):
> On 30/06/15 13:35, Andrew Cooper wrote:
> > On 30/06/15 13:22, Julien Grall wrote:
> > They were only like that because of limitations with the older
> > $(wildcard ...) invocation.
> 
> What kind of limitations? Similar pattern were used to match markdown
> and txt.

Indeed.

> In anycase, the patch which replaced wildcard by find retains the same
> behavior. Changing the pattern is not a bug and should be part of a
> separate patch.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

> Feel free to send a follow-up.

Indeed.

Thanks,
Ian.

Re: [PATCH] docs: Fix docs output after commit 6592bf6

[Ian Campbell]

On Tue, 2015-06-30 at 14:52 +0100, Ian Jackson wrote:
> Julien Grall writes ("Re: [Xen-devel] [PATCH] docs: Fix docs output after commit 6592bf6"):
> > On 30/06/15 13:35, Andrew Cooper wrote:
> > > On 30/06/15 13:22, Julien Grall wrote:
> > > They were only like that because of limitations with the older
> > > $(wildcard ...) invocation.
> > 
> > What kind of limitations? Similar pattern were used to match markdown
> > and txt.
> 
> Indeed.
> 
> > In anycase, the patch which replaced wildcard by find retains the same
> > behavior. Changing the pattern is not a bug and should be part of a
> > separate patch.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

Me too ;-) But in a batch with some other stuff which needed build
testing. I'll rewind!