From bb09f771958150e9465a5dc9d8e62aa8477c17a4 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 8 Apr 2004 11:18:59 +0000 Subject: [PATCH] Fix samba-docs build after svn conversion and Samba3 By Example addition. Now we are able to build everything in samba-docs properly. --- docs/Makefile.in | 29 ++--- docs/configure.in | 2 +- docs/devel/dev-doc.xml | 2 +- docs/{global.ent => entities/global.entities} | 158 +++++++++++++------------- docs/entities/xinclude.dtd | 31 +++++ docs/howto/index.xml | 2 +- docs/manpages/editreg.1.xml | 2 +- docs/manpages/findsmb.1.xml | 2 +- docs/manpages/lmhosts.5.xml | 2 +- docs/manpages/log2pcap.1.xml | 2 +- docs/manpages/mount.cifs.8.xml | 2 +- docs/manpages/net.8.xml | 2 +- docs/manpages/nmbd.8.xml | 2 +- docs/manpages/nmblookup.1.xml | 2 +- docs/manpages/ntlm_auth.1.xml | 2 +- docs/manpages/pdbedit.8.xml | 2 +- docs/manpages/profiles.1.xml | 2 +- docs/manpages/rpcclient.1.xml | 2 +- docs/manpages/samba.7.xml | 2 +- docs/manpages/smbcacls.1.xml | 2 +- docs/manpages/smbclient.1.xml | 2 +- docs/manpages/smbcontrol.1.xml | 2 +- docs/manpages/smbcquotas.1.xml | 2 +- docs/manpages/smbd.8.xml | 2 +- docs/manpages/smbget.1.xml | 2 +- docs/manpages/smbmnt.8.xml | 2 +- docs/manpages/smbmount.8.xml | 2 +- docs/manpages/smbpasswd.5.xml | 2 +- docs/manpages/smbpasswd.8.xml | 2 +- docs/manpages/smbsh.1.xml | 2 +- docs/manpages/smbspool.8.xml | 2 +- docs/manpages/smbstatus.1.xml | 2 +- docs/manpages/smbtar.1.xml | 2 +- docs/manpages/smbtree.1.xml | 2 +- docs/manpages/smbumount.8.xml | 2 +- docs/manpages/swat.8.xml | 2 +- docs/manpages/tdbbackup.8.xml | 2 +- docs/manpages/tdbdump.8.xml | 2 +- docs/manpages/testparm.1.xml | 2 +- docs/manpages/testprns.1.xml | 2 +- docs/manpages/vfstest.1.xml | 2 +- docs/manpages/wbinfo.1.xml | 2 +- docs/manpages/winbindd.8.xml | 2 +- docs/xslt/expand-sambadoc.xsl | 2 +- 44 files changed, 167 insertions(+), 133 deletions(-) rename docs/{global.ent => entities/global.entities} (78%) create mode 100644 docs/entities/xinclude.dtd diff --git a/docs/Makefile.in b/docs/Makefile.in index 7602476cb46..791a1532a97 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -31,24 +31,25 @@ LATEX += --interaction nonstopmode endif # Paths -OUTPUTDIR = output -ARCHIVEDIR = output/archive +TOPDIR = $(shell pwd) +OUTPUTDIR = $(TOPDIR)/output +ARCHIVEDIR = $(OUTPUTDIR)/archive SRCDIR = @srcdir@ MANDIR=$(OUTPUTDIR)/manpages EPSTOPDF = @EPSTOPDF@ -MANPAGEDIR = manpages -HOWTODIR = howto +MANPAGEDIR = $(TOPDIR)/manpages +HOWTODIR = $(TOPDIR)/howto MAKEINDEX = @MAKEINDEX@ IMAGEPROJDIR = $(HOWTODIR)/imagefiles -GUIDEDOC = guide -EXAMPLESDIR = examples -DEVDOC = devdoc -SMBDOTCONFDOC = smbdotconf +GUIDEDOC = $(TOPDIR)/guide +EXAMPLESDIR = $(TOPDIR)/examples +DEVDOC = $(TOPDIR)/devdoc +SMBDOTCONFDOC = $(TOPDIR)/smbdotconf PSDIR = $(OUTPUTDIR) PDFDIR = $(OUTPUTDIR) DVIDIR = $(OUTPUTDIR) TXTDIR = $(OUTPUTDIR)/textdocs -FAQHOWTODIR = faq +FAQHOWTODIR = $(TOPDIR)/faq FAQDIR = $(OUTPUTDIR)/faq HTMLDIR=$(OUTPUTDIR)/htmldocs PLUCKERDIR=$(OUTPUTDIR)/plucker @@ -153,7 +154,7 @@ clean: rm -f $(PLUCKERDIR)/*.pdb # Text files -$(TXTDIR): +$(TXTDIR): $(OUTPUTDIR) mkdir $(TXTDIR) $(TXTDIR)/%.txt: %.xml @@ -196,12 +197,14 @@ $(PSDIR)/%.ps: $(DVIDIR)/%.dvi xslt/figures/%.pdf: xslt/figures/%.eps $(EPSTOPDF) $< +$(OUTPUTDIR): + mkdir $(OUTPUTDIR) # Single large HTML files -$(HTMLDIR): +$(HTMLDIR): $(OUTPUTDIR) mkdir $(HTMLDIR) -$(PLUCKERDIR): +$(PLUCKERDIR): $(OUTPUTDIR) mkdir $(PLUCKERDIR) CSS: $(HTMLDIR) xslt/html/samba.css @@ -248,7 +251,7 @@ smb.conf.5.xml: $(SMBDOTCONFDOC)/smb.conf.5.xml $(SMBDOTCONFDOC)/parameters.all. $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.service.xml $(XSLTPROC) --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $< -$(MANDIR): +$(MANDIR): $(OUTPUTDIR) mkdir $(MANDIR) $(MANDIR)/%: %.xml diff --git a/docs/configure.in b/docs/configure.in index 5c21f08a832..1fa6c915a2f 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -1,4 +1,4 @@ -AC_INIT(global.ent) +AC_INIT(entities/global.entities) AC_PATH_PROG(XSLTPROC, xsltproc) if test "x$XSLTPROC" = x; then diff --git a/docs/devel/dev-doc.xml b/docs/devel/dev-doc.xml index b97b3d8f866..8a9e165a797 100644 --- a/docs/devel/dev-doc.xml +++ b/docs/devel/dev-doc.xml @@ -1,6 +1,6 @@ %globalentities; + %globalentities; diff --git a/docs/global.ent b/docs/entities/global.entities similarity index 78% rename from docs/global.ent rename to docs/entities/global.entities index 1efdd62528c..c4b1d7f33e3 100644 --- a/docs/global.ent +++ b/docs/entities/global.entities @@ -469,85 +469,85 @@ an Active Directory environment. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Currently NOT implemented."> root# "> diff --git a/docs/entities/xinclude.dtd b/docs/entities/xinclude.dtd new file mode 100644 index 00000000000..1634275be08 --- /dev/null +++ b/docs/entities/xinclude.dtd @@ -0,0 +1,31 @@ + + + + + + + + + + + + + diff --git a/docs/howto/index.xml b/docs/howto/index.xml index 410cbc010ab..79d7c24617f 100644 --- a/docs/howto/index.xml +++ b/docs/howto/index.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/editreg.1.xml b/docs/manpages/editreg.1.xml index 0a6b36bcf0f..1022887edfb 100644 --- a/docs/manpages/editreg.1.xml +++ b/docs/manpages/editreg.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/findsmb.1.xml b/docs/manpages/findsmb.1.xml index 8a89b2ce24a..7159e41566c 100644 --- a/docs/manpages/findsmb.1.xml +++ b/docs/manpages/findsmb.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/lmhosts.5.xml b/docs/manpages/lmhosts.5.xml index afee69bc96b..246db3035d3 100644 --- a/docs/manpages/lmhosts.5.xml +++ b/docs/manpages/lmhosts.5.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/log2pcap.1.xml b/docs/manpages/log2pcap.1.xml index e8c03c5dc12..bf40a2ef59e 100644 --- a/docs/manpages/log2pcap.1.xml +++ b/docs/manpages/log2pcap.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/mount.cifs.8.xml b/docs/manpages/mount.cifs.8.xml index d674d03cac9..b57480e02e5 100644 --- a/docs/manpages/mount.cifs.8.xml +++ b/docs/manpages/mount.cifs.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/net.8.xml b/docs/manpages/net.8.xml index 21dc54d452c..a6d4099045d 100644 --- a/docs/manpages/net.8.xml +++ b/docs/manpages/net.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/nmbd.8.xml b/docs/manpages/nmbd.8.xml index db65c489190..31b1d123a3f 100644 --- a/docs/manpages/nmbd.8.xml +++ b/docs/manpages/nmbd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/nmblookup.1.xml b/docs/manpages/nmblookup.1.xml index 14df0066f59..46cfd7a926c 100644 --- a/docs/manpages/nmblookup.1.xml +++ b/docs/manpages/nmblookup.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/ntlm_auth.1.xml b/docs/manpages/ntlm_auth.1.xml index f4478f7d41f..fc5b34c3e47 100644 --- a/docs/manpages/ntlm_auth.1.xml +++ b/docs/manpages/ntlm_auth.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/pdbedit.8.xml b/docs/manpages/pdbedit.8.xml index e05c7295725..06b53f1bcd7 100644 --- a/docs/manpages/pdbedit.8.xml +++ b/docs/manpages/pdbedit.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/profiles.1.xml b/docs/manpages/profiles.1.xml index 3ae823f634a..52cd9dfcfce 100644 --- a/docs/manpages/profiles.1.xml +++ b/docs/manpages/profiles.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/rpcclient.1.xml b/docs/manpages/rpcclient.1.xml index 35104586104..35c71ddd616 100644 --- a/docs/manpages/rpcclient.1.xml +++ b/docs/manpages/rpcclient.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/samba.7.xml b/docs/manpages/samba.7.xml index 7f31ab3bc50..bf791cf253b 100644 --- a/docs/manpages/samba.7.xml +++ b/docs/manpages/samba.7.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbcacls.1.xml b/docs/manpages/smbcacls.1.xml index 78980a6aec5..cfc5ddbd367 100644 --- a/docs/manpages/smbcacls.1.xml +++ b/docs/manpages/smbcacls.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbclient.1.xml b/docs/manpages/smbclient.1.xml index 78cc642e76e..e268019fea5 100644 --- a/docs/manpages/smbclient.1.xml +++ b/docs/manpages/smbclient.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbcontrol.1.xml b/docs/manpages/smbcontrol.1.xml index af6054de582..5315b25e7bd 100644 --- a/docs/manpages/smbcontrol.1.xml +++ b/docs/manpages/smbcontrol.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbcquotas.1.xml b/docs/manpages/smbcquotas.1.xml index 280d1b6364e..a1e2ad9b24d 100644 --- a/docs/manpages/smbcquotas.1.xml +++ b/docs/manpages/smbcquotas.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbd.8.xml b/docs/manpages/smbd.8.xml index 4a3d3fdc0cf..cf98be9fcb5 100644 --- a/docs/manpages/smbd.8.xml +++ b/docs/manpages/smbd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbget.1.xml b/docs/manpages/smbget.1.xml index 96b8cf10c86..6f899e04ad3 100644 --- a/docs/manpages/smbget.1.xml +++ b/docs/manpages/smbget.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbmnt.8.xml b/docs/manpages/smbmnt.8.xml index 0495fa5be0f..4f57234345f 100644 --- a/docs/manpages/smbmnt.8.xml +++ b/docs/manpages/smbmnt.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbmount.8.xml b/docs/manpages/smbmount.8.xml index 0017c99cd53..ffcac0fbfa9 100644 --- a/docs/manpages/smbmount.8.xml +++ b/docs/manpages/smbmount.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbpasswd.5.xml b/docs/manpages/smbpasswd.5.xml index cb6a6070bd3..375d3e38eba 100644 --- a/docs/manpages/smbpasswd.5.xml +++ b/docs/manpages/smbpasswd.5.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbpasswd.8.xml b/docs/manpages/smbpasswd.8.xml index 3ee3a9e12eb..0407027907d 100644 --- a/docs/manpages/smbpasswd.8.xml +++ b/docs/manpages/smbpasswd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbsh.1.xml b/docs/manpages/smbsh.1.xml index 36319085b80..ebd4d1d240e 100644 --- a/docs/manpages/smbsh.1.xml +++ b/docs/manpages/smbsh.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbspool.8.xml b/docs/manpages/smbspool.8.xml index ec62a0d5df8..72cea33f3ee 100644 --- a/docs/manpages/smbspool.8.xml +++ b/docs/manpages/smbspool.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbstatus.1.xml b/docs/manpages/smbstatus.1.xml index 1e96b392632..5c0bad5219f 100644 --- a/docs/manpages/smbstatus.1.xml +++ b/docs/manpages/smbstatus.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbtar.1.xml b/docs/manpages/smbtar.1.xml index c7739378441..4843085565c 100644 --- a/docs/manpages/smbtar.1.xml +++ b/docs/manpages/smbtar.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbtree.1.xml b/docs/manpages/smbtree.1.xml index f9661f4849f..05c843614f6 100644 --- a/docs/manpages/smbtree.1.xml +++ b/docs/manpages/smbtree.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/smbumount.8.xml b/docs/manpages/smbumount.8.xml index d8feb8e9382..43178ea4329 100644 --- a/docs/manpages/smbumount.8.xml +++ b/docs/manpages/smbumount.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/swat.8.xml b/docs/manpages/swat.8.xml index 902918d9329..f10a3c75913 100644 --- a/docs/manpages/swat.8.xml +++ b/docs/manpages/swat.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/tdbbackup.8.xml b/docs/manpages/tdbbackup.8.xml index e5f060b101f..321ec3f8f9b 100644 --- a/docs/manpages/tdbbackup.8.xml +++ b/docs/manpages/tdbbackup.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/tdbdump.8.xml b/docs/manpages/tdbdump.8.xml index c31bef480b3..38119678c63 100644 --- a/docs/manpages/tdbdump.8.xml +++ b/docs/manpages/tdbdump.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/testparm.1.xml b/docs/manpages/testparm.1.xml index 84ead172348..3b282e44ec2 100644 --- a/docs/manpages/testparm.1.xml +++ b/docs/manpages/testparm.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/testprns.1.xml b/docs/manpages/testprns.1.xml index 50584f5a180..9f039104821 100644 --- a/docs/manpages/testprns.1.xml +++ b/docs/manpages/testprns.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/vfstest.1.xml b/docs/manpages/vfstest.1.xml index 7b68963fba2..69f617c9228 100644 --- a/docs/manpages/vfstest.1.xml +++ b/docs/manpages/vfstest.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/wbinfo.1.xml b/docs/manpages/wbinfo.1.xml index 728e4f166a1..c9f3b3a2527 100644 --- a/docs/manpages/wbinfo.1.xml +++ b/docs/manpages/wbinfo.1.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/manpages/winbindd.8.xml b/docs/manpages/winbindd.8.xml index 0986b101198..bfa3b4ff53a 100644 --- a/docs/manpages/winbindd.8.xml +++ b/docs/manpages/winbindd.8.xml @@ -1,7 +1,7 @@ %globalentities; + %globalentities; ]> diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl index 2c9aa0a82aa..d72725ab26d 100644 --- a/docs/xslt/expand-sambadoc.xsl +++ b/docs/xslt/expand-sambadoc.xsl @@ -75,7 +75,7 @@ <!DOCTYPE PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ - <!ENTITY % globalentities SYSTEM 'global.ent'> %globalentities; + <!ENTITY % globalentities SYSTEM 'entities/global.entities'> %globalentities; ]> -- 2.11.4.GIT