Fix docs build and installation. Contents are still out of date though.

diff --git a/Makefile b/Makefile
index 471156baf97ccce5ccac41d0b746d80ec15d24ca..61a27733868746418f103fa418f285a83f62c2b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ install-dirs:
 install-bin:
        $(INSTALL) ctrlproxy$(EXEEXT) $(DESTDIR)$(bindir)
 
-install-doc:
+install-doc: doc
        $(INSTALL) -m 644 ctrlproxy.h $(DESTDIR)$(destincludedir)
        $(INSTALL) AUTHORS $(DESTDIR)$(docdir)
        $(INSTALL) COPYING $(DESTDIR)$(docdir)

diff --git a/Makefile.settings.in b/Makefile.settings.in
index 1915aec4228c284f405eecbf6fd587d6d380bb01..4b6832f9be78d8bdb831a054ef370731235b769d 100644 (file)
--- a/Makefile.settings.in
+++ b/Makefile.settings.in
@@ -10,6 +10,7 @@ docdir = @prefix@/share/doc/ctrlproxy
 modulesdir = @libdir@/ctrlproxy
 libdir = @libdir@
 includedir = @includedir@
+mandir = @mandir@
 destincludedir = @DESTINCLUDEDIR@
 cdatadir = @datadir@/ctrlproxy
 EXEEXT = @EXEEXT@
@@ -34,3 +35,5 @@ SWIG = @SWIG@
 PYTHON_CFLAGS = @PYTHON_CPPFLAGS@
 PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ @PYTHON_EXTRA_LIBS@
 IRCDTORTURE = @IRCDTORTURE@
+XSLTPROC = @XSLTPROC@
+EXTRA_INSTALL_TARGETS = @EXTRA_INSTALL_TARGETS@

diff --git a/configure.ac b/configure.ac
index f2cf5dd4df8370af2d4245ad5744a27957f46c10..71624bb6fd7fb1fd80012b01f4166ff411b34aba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -105,11 +105,16 @@ else
        DEFMODULE(python2, $PY_LIBS)
 fi
 
-sinclude(doc/config.m4)
-AC_CONFIG_FILES(doc/Makefile.settings)
+AC_PATH_PROG(XSLTPROC, xsltproc)
+
+AC_SUBST(XSLTPROC)
+
+if test -n "$XSLTPROC"
+then
+       EXTRA_INSTALL_TARGETS="install-doc"
+fi
 
 AC_SUBST(EXTRA_INSTALL_TARGETS)
-test -f doc/most && EXTRA_INSTALL_TARGETS="install-doc"
 
 BINS="ctrlproxy$ac_cv_exeext"
 DEFMODULE(log_irssi)

diff --git a/doc/Makefile b/doc/Makefile
index c13f402c5afce78f073bdcab0c284b7a5ae6c2cb..28b4a5b082529ac7787c0baae3f0dd223a43dc6e 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,27 +1,19 @@
-include Makefile.settings
-DOCS = ctrlproxy.1 ctrlproxyrc.5 user-guide/index.html
+include ../Makefile.settings
+DOCS = ctrlproxy.1 ctrlproxyrc.5 user-guide.html user-guide/index.html
 
-.PHONY: all most manpages htmlmanpages lint clean distclean
+.PHONY: all manpages clean distclean
 
-most: $(DOCS)
-all: $(DOCS) ctrlproxy.pdf ctrlproxy.ps
-everything: $(DOCS) htmlmanpages
+all: $(DOCS)
 
-dist: most
+dist: all
 
 manpages: ctrlproxy.1 ctrlproxyrc.5 
 
 %/index.html: %.xml
-       $(XMLTO) -o $(@D) html $<
+       $(XSLTPROC) --stringparam base.dir "$(@D)/" http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
 
 %.html: %.xml
-       $(XMLTO) html-nochunks $<
-
-%.ps: %.xml 
-       $(XMLTO) ps $<
-
-lint: ctrlproxy.xml 
-       $(XMLLINT) --valid --noout --xinclude $<
+       $(XSLTPROC) http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
 
 %.1: %.1.xml 
        $(XSLTPROC) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< > $@
@@ -29,20 +21,17 @@ lint: ctrlproxy.xml
 %.5: %.5.xml
        $(XSLTPROC) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< > $@
 
-%.pdf: %.xml
-       $(XMLTO) pdf $<
-
-clean: 
-       rm -f *.html *.pdf $(DOCS)
+clean::
+       rm -f *.html *.1 *.5
+       rm -rf user-guide
 
-distclean: clean
+distclean:: clean
        rm -f Makefile.settings
 
-install: most
-       $(INSTALL) -d $(DESTDIR)$(man1dir)
-       $(INSTALL) -d $(DESTDIR)$(man5dir)
+install: all
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man5
        $(INSTALL) -d $(DESTDIR)$(docdir)
-       $(INSTALL) ctrlproxy.1 $(DESTDIR)$(man1dir)
-       $(INSTALL) ctrlproxyrc.5 $(DESTDIR)$(man5dir)
-       $(INSTALL) ctrlproxy.pdf $(DESTDIR)$(docdir)
-       $(INSTALL) ctrlproxy.html $(DESTDIR)$(docdir)
+       $(INSTALL) ctrlproxy.1 $(DESTDIR)$(mandir)/man1
+       $(INSTALL) ctrlproxyrc.5 $(DESTDIR)$(mandir)/man5
+       $(INSTALL) user-guide.html $(DESTDIR)$(docdir)

diff --git a/doc/Makefile.settings.in b/doc/Makefile.settings.in
deleted file mode 100644 (file)
index 1753570..0000000
--- a/doc/Makefile.settings.in
+++ /dev/null
@@ -1,8 +0,0 @@
-XSLTPROC = @XSLTPROC@ --xinclude
-XMLTO = @XMLTO@
-prefix = @prefix@
-docdir = @prefix@/share/doc/ctrlproxy/
-INSTALL = @INSTALL@
-mandir = @mandir@
-man1dir = @mandir@/man1
-man5dir = @mandir@/man5

diff --git a/doc/config.m4 b/doc/config.m4
deleted file mode 100644 (file)
index 700e377..0000000
--- a/doc/config.m4
+++ /dev/null
@@ -1,14 +0,0 @@
-# For the docs
-AC_PATH_PROG(XSLTPROC, xsltproc)
-AC_PATH_PROG(XMLTO, xmlto)
-AC_PATH_PROG(XMLLINT, xmllint)
-AC_PATH_PROG(INSTALL, install)
-
-AC_SUBST(DIA)
-AC_SUBST(SYNPROG)
-AC_SUBST(XSLTPROC)
-AC_SUBST(XMLLINT)
-AC_SUBST(XMLTO)
-
-DOCS_ENABLED="1"
-test -z "$XSLTPROC" || DOCS_ENABLED="1"

diff --git a/doc/ctrlproxy.1.xml b/doc/ctrlproxy.1.xml
index 7171f25abb4ee0526baaeb6fe6b2c1c223ced50b..25bc1c3a2d3c56e402a5ab9e7323f06fc43d98a4 100644 (file)
--- a/doc/ctrlproxy.1.xml
+++ b/doc/ctrlproxy.1.xml
@@ -88,22 +88,6 @@ on the number of servers it is connected to.
 
 </refsect1>
 
-<refsect1>
-<title>PLUGINS</title>
-
-<para>Current included plugins with ctrlproxy are:</para>
-
-<!--FIXME: Autogenerate ? -->
-<variablelist>
-       <xi:include href="modules.list.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-</variablelist>
-
-<para>
-Read the relevant manpages for more info about these plugins.
-</para>
-
-</refsect1>
-
 <refsect1>
        <title>SIGNALS</title>