[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Tue Jun 21 11:48:44 MDT 2011

The branch, v3-5-test has been updated
       via  08e64ab docs: fix the missing parameter description section in the smb.conf manpage
      from  a33b603 libreplace: include sys/file.h only when available


- Log -----------------------------------------------------------------
commit 08e64ab50b9202ccbc6c0b397f9ac8cc467c2254
Author: Michael Adam <obnox at samba.org>
Date:   Tue Apr 5 23:07:01 2011 +0200

    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).


Summary of changes:
 docs-xml/Makefile |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

Changeset truncated at 500 lines:

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) > $@

Samba Shared Repository

More information about the samba-cvs mailing list