doc makefile

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@158 7f574dfc-610e-0410-a909-a81674777703

diff --git a/README b/README
index f32a19e..00ec525 100644 (file)
--- a/README
+++ b/README
@@ -377,7 +377,7 @@ VARIABLES
              Same as execbar, but graphs values
 
 
-       execi interval, shell command
+       execi interval command
              Same  as exec but with specific interval. Interval can't be less
              than update_interval in configuration.
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f1f9728..fae8388 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,15 +1,19 @@
-man_MANS = conky.1.gz
+man_MANS = conky.1.gz ../README docs.html
 
 clean-am: clean-generic mostlyclean-am
        rm -f docs.mxml
        rm -f conky.1.gz
 
 if HAVE_DOCSTUFF
-conky.1.gz: command_options.xml config_settings.xml docgen.sh docs.xml variables.xml
-        ${XSLPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${srcdir}/docs.xml > docs.html
+conky.1.gz: command_options.xml config_settings.xml docs.xml variables.xml 
        ${DB2X_XSLPROC} -s man ${srcdir}/docs.xml -o docs.mxml
        ${DB2X_MANXML} docs.mxml
        gzip -f conky.1
+
+docs.html: command_options.xml config_settings.xml docs.xml variables.xml
+       ${XSLPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${srcdir}/docs.xml > docs.html
+
+../README: conky.1.gz
        man ./conky.1.gz | col -b > README
        mv README ${top_srcdir}
 endif