diff options
| author | Michael Adam <obnox@samba.org> | 2011-04-05 23:07:01 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-08-02 21:09:12 +0200 |
| commit | c3e04c3a0e63813a307f2e6a88077b8945b145f1 (patch) | |
| tree | 23b2c733237407a33e7ca9116fe5f24af75d3929 /docs-xml | |
| parent | fc89d0a91e62cce3b3546291f496fc12da8c6d16 (diff) | |
| download | samba-c3e04c3a0e63813a307f2e6a88077b8945b145f1.tar.gz | |
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.
Fix bug #7997 (smb.conf.5 manpage truncated in 3.5.8).
(cherry picked from commit 08e64ab50b9202ccbc6c0b397f9ac8cc467c2254)
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 40a6c7b6102..40aa16108bd 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) > $@ |