Attachment 6376 Details for Bug 7997 – patch for master

[patch] patch for master

0001-docs-fix-the-missing-parameter-description-section-i.patch (text/plain), 1.92 KB, created by Michael Adam on 2011-04-05 21:19:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2011-04-05 21:19:04 UTC

Size: 1.92 KB

patch

obsolete

>From 57d99408fb0e5685517fd62e56e92356ddf80bd4 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Tue, 5 Apr 2011 23:07:01 +0200
>Subject: [PATCH] docs: fix the missing parameter description section in the smb.conf manpage
>
>The smb.conf (5) manpage recently sometimes failed to contain the
>contents of the description of each parameter section. The reason
>was a unreliable chain of dependencies in the Makefile.
>
>The error can be reproduced by touching manpages-3/smb.conf.5.xml
>and then building the manpages.
>Then smb.conf.5.xml is newer than any of the smbdotconf/*/*.xml
>files and hence the intermediate inexistent parameters.*.xml
>don't get generated.
>
>This patch fixes this problem by introducing a phony "parameters"
>target referencing the parameters.*.xml targets, so that they
>get build unconditionally.
>---
> docs-xml/Makefile |   10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
>
>diff --git a/docs-xml/Makefile b/docs-xml/Makefile
>index 40a6c7b..40aa161 100644
>--- a/docs-xml/Makefile
>+++ b/docs-xml/Makefile
>@@ -181,7 +181,15 @@ $(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi
> 	$(MAKEINFO) --no-validate --force -o $@ "$<"
> 
> # Manpages
>-$(MANPAGEDIR3)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
>+$(MANPAGEDIR3)/smb.conf.5.xml: parameters
>+
>+# The phony parameters target exists in order to always create the
>+# the parameters xml files. Otherwise, when parameters.*.xml does not exist
>+# yet, the parameters are not generated when smb.conf.5.xml is newer than
>+# any smbdotconf/*/*.xml file ...
>+.PHONY: parameters
>+
>+parameters: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
> 
> $(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh
> 	$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
>-- 
>1.7.1
>

Flags:

gd: review+

Actions: View

Attachments on bug 7997: 6376