summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-04-05 23:07:01 +0200
committerMichael Adam <obnox@samba.org>2011-04-06 01:22:00 +0200
commit82e0ba22ce51659d9c455c477d217bc8bbaf71b3 (patch)
treea46ad2ace776405048263d339e6ccf7d89f9e249
parentf52b3180fe314dbfb6bfd0f27b36ceb7a49e8231 (diff)
downloadsamba-82e0ba22ce51659d9c455c477d217bc8bbaf71b3.tar.gz
samba-82e0ba22ce51659d9c455c477d217bc8bbaf71b3.tar.bz2
samba-82e0ba22ce51659d9c455c477d217bc8bbaf71b3.zip
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. Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Wed Apr 6 01:22:00 CEST 2011 on sn-devel-104
-rw-r--r--docs-xml/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 40a6c7b610..40aa16108b 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) > $@