diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-07-30 22:21:25 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:45:59 -0500 |
| commit | 4ec61fc89ce523160ecb44abb992a9fb6792d297 (patch) | |
| tree | 7590b876007aa148609d72cf97669a4b9621ade7 | |
| parent | 6867b528715af1001881b5451ec525327a85d4a4 (diff) | |
| download | samba-4ec61fc89ce523160ecb44abb992a9fb6792d297.tar.gz samba-4ec61fc89ce523160ecb44abb992a9fb6792d297.tar.bz2 samba-4ec61fc89ce523160ecb44abb992a9fb6792d297.zip | |
Use gpl.xml instead of gpl.tex
(This used to be commit 0f64fa4d661593a5a38222e1c9c0621d08c7d517)
| -rw-r--r-- | docs/Makefile.in | 8 | ||||
| -rw-r--r-- | docs/Samba-Guide/index.xml | 2 | ||||
| -rw-r--r-- | docs/Samba-HOWTO-Collection/index.xml | 2 | ||||
| -rw-r--r-- | docs/aclocal.m4 | 3 | ||||
| -rw-r--r-- | docs/configure.in | 1 |
5 files changed, 7 insertions, 9 deletions
diff --git a/docs/Makefile.in b/docs/Makefile.in index ef551e0a78..a67a095bbd 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -6,7 +6,6 @@ # Jelmer Vernooij <jelmer@samba.org> # Programs -WGET = @WGET@ XSLTPROC = @XSLTPROC@ XMLLINT = @XMLLINT@ DVIPS = @DVIPS@ @@ -153,9 +152,6 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html mkdir -p $(@D) $(XSLTPROC) --output $@ xslt/latex.xsl $< -gpl.tex: - $(WGET) http://www.gnu.org/licenses/gpl.tex - latexfigures: $(LATEX_FIGURES) $(PDFDIR)/%.pdf: %.pdf @@ -163,7 +159,7 @@ $(PDFDIR)/%.pdf: %.pdf cp $< $@ # Adobe PDF files -%.pdf: %.tex latexfigures gpl.tex +%.pdf: %.tex latexfigures -$(PDFLATEX) $< -$(PDFLATEX) $< $(MAKEINDEX) $* @@ -175,7 +171,7 @@ $(DVIDIR)/%.dvi: %.dvi mkdir -p $(@D) cp $< $@ -%.dvi: %.tex %.idx gpl.tex +%.dvi: %.tex %.idx $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml) -$(LATEX) $< -$(LATEX) $< diff --git a/docs/Samba-Guide/index.xml b/docs/Samba-Guide/index.xml index 1288db26f1..2d52022197 100644 --- a/docs/Samba-Guide/index.xml +++ b/docs/Samba-Guide/index.xml @@ -47,7 +47,7 @@ <xi:include href="Chap10b-DomainAppsSupport.xml"/>
<xi:include href="Chap11-HighAvailability.xml"/>
<xi:include href="Chap12-Appendix.xml"/>
- <?latex \include{gpl}?>
+ <xi:include href="http://www.gnu.org/licenses/gpl.xml"/>
<xi:include href="glossary.xml"/>
<index/>
</book>
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml index a04e692ccd..082a019849 100644 --- a/docs/Samba-HOWTO-Collection/index.xml +++ b/docs/Samba-HOWTO-Collection/index.xml @@ -179,7 +179,7 @@ Samba has several features that you might want or might not want to use. The cha -<?latex \include{gpl}?> +<xi:include href="http://www.gnu.org/licenses/gpl.xml"/> <xi:include href="glossary.xml"/> diff --git a/docs/aclocal.m4 b/docs/aclocal.m4 index 073d2aafd2..ec451a4968 100644 --- a/docs/aclocal.m4 +++ b/docs/aclocal.m4 @@ -1,3 +1,6 @@ +dnl (C) 2003-2004 Jelmer Vernooij <jelmer@samba.org> +dnl Published under the GNU GPL +dnl dnl DOCS_DEFINE_TARGET dnl arg1: Target that is defined dnl arg2: Requirement diff --git a/docs/configure.in b/docs/configure.in index 9d47030937..227a91e286 100644 --- a/docs/configure.in +++ b/docs/configure.in @@ -37,7 +37,6 @@ AC_SUBST(SAMBASOURCEDIR) DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX) -DOCS_TARGET_REQUIRE_PROGRAM(WGET, wget, LATEX) DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF) DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF) DOCS_TARGET_REQUIRE_PROGRAM(THUMBPDF, thumbpdf, PDF) |