[SCM] Samba Shared Repository - branch master updated
Karolin Seeger
kseeger at samba.org
Mon Sep 10 06:20:13 MDT 2012
The branch, master has been updated
via 54f1ce4 docs: Rename htmlman3 -> htmlman.
from 06809f4 s4:provision: ask the admin about the desired DNS implementation
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 54f1ce4c797aacc71423a0b30ead89936b0d591d
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Sep 10 12:28:19 2012 +0200
docs: Rename htmlman3 -> htmlman.
Karolin
Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(master): Mon Sep 10 14:19:42 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 8 ++++----
docs-xml/configure.ac | 2 +-
release-scripts/build-htmlman-git | 2 +-
release-scripts/build-htmlman-nogit | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 3070376..65d9aec 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -36,7 +36,7 @@ help:
@echo " pdf,tex,ps,manpages,txt,pearson,htmlhelp - Build specific output format"
@echo " html - Build multi-file HTML versions"
@echo " html-single - Build single-file HTML versions"
- @echo " htmlman3 - Build HTML version of manpages"
+ @echo " htmlman - Build HTML version of manpages"
@echo " undocumented - Output list of undocumented smb.conf options"
@echo " samples - Extract examples"
@@ -47,8 +47,8 @@ $(PDFDIR)/Samba3-Developers-Guide.pdf $(PSDIR)/Samba3-Developers-Guide.ps $(DOCB
# Pseudo targets
all:: $(TARGETS)
-everything:: manpages pdf html-single html htmlman3 txt ps fo htmlhelp pearson
-release:: manpages htmlman3 html pdf
+everything:: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson
+release:: manpages htmlman html pdf
clean::
@echo "Cleaning up..."
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
@@ -75,7 +75,7 @@ manpages:: $(patsubst $(MANPAGEDIR)/%.xml,$(OUTPUTDIR)/manpages/%,$(MANPAGES))
pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
-htmlman3:: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/manpages/%.html,$(MANPAGES)) $(HTMLDIR)/manpages/index.html
+htmlman:: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/manpages/%.html,$(MANPAGES)) $(HTMLDIR)/manpages/index.html
html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
htmlhelp:: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 360c942..fe889a2 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -37,7 +37,7 @@ DOCS_DEFINE_TARGET(ALL, [], [base requirements], [])
DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex ps pdf])
DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
-DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3])
+DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman])
DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages])
DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
diff --git a/release-scripts/build-htmlman-git b/release-scripts/build-htmlman-git
index f108549..9079a4c 100755
--- a/release-scripts/build-htmlman-git
+++ b/release-scripts/build-htmlman-git
@@ -36,7 +36,7 @@ autoconf || _exit "Error running autoconf."
export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
-make htmlman3 || _exit "Error running make htmlman3"
+make htmlman || _exit "Error running make htmlman"
popd
diff --git a/release-scripts/build-htmlman-nogit b/release-scripts/build-htmlman-nogit
index afd388b..3f3ff2d 100755
--- a/release-scripts/build-htmlman-nogit
+++ b/release-scripts/build-htmlman-nogit
@@ -39,7 +39,7 @@ make clean || _exit "Error running make clean"
# re-establish catalog (has been removed by make clean...)
./config.status
-make htmlman3 || _exit "Error running make htmlman3"
+make htmlman || _exit "Error running make htmlman"
popd
--
Samba Shared Repository
More information about the samba-cvs
mailing list