autogen.sh is broken for now, added instructions for cvs build

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

diff --git a/README-cvs-version b/README-cvs-version
new file mode 100644 (file)
index 0000000..beef1ea
--- /dev/null
+++ b/README-cvs-version
@@ -0,0 +1,29 @@
+First, read the README. This contains instructions specific to building conky 
+fresh from a CVS checkout: 
+
+* As the README says, you need to have the X   development libraries installed. 
+       This should be a package along the lines of libx11-dev or xorg-x11-dev .
+* Conky requires three "auto-tools", with at least the specific version numbers.
+       Make sure these are installed:
+       
+       aclocal-1.9
+       automake-1.9
+       autoconf-2.59
+
+* In the directory where you checked out conky from CVS, 
+       run "aclocal", "automake", and then "autoconf". 
+       Make sure you run those commands with the latest versions...
+       it is very possible that older versions are installed, and 
+       plain "automake" really means automake-1.4, not what we want,
+       but "automake-1.9" instead.
+       Use the "--version" option to check the program version, i.e.
+       "autoconf --version". 
+* After that, it's the familiar 
+
+       ./configure 
+       make 
+       make install
+
+       You might have to do the last two steps as root. 
+
+Need more help? Try channel #conky on irc, or email conky-users@lists.sourceforge.net

diff --git a/doc/docs.xml b/doc/docs.xml
index fccf2d2..8159c57 100644 (file)
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -58,7 +58,12 @@
        <refsect1>
                <title>Compiling</title>
                <para>
-               To compile and run Conky with all optional components (If you run Gentoo, see the "Ebuild" Section below):
+               First, make sure you have the X development libraries installed, this should be a package along the lines 
+               of "libx11-dev or xorg-x11-dev". Gentoo users, Conky is in Gentoo's Portage.  Simply use "emerge conky" for installation.
+               There is also usually an up-to-date ebuild within Conky's package or in CVS.
+               </para>
+               <para>
+               To compile and run Conky with all optional components:
                </para>
                <variablelist>
                        <varlistentry>
@@ -98,8 +103,7 @@
                        --disable-own-window to configure -script.
                </para>
                <para>
-                       Conky is in Gentoo's Portage.  Simply use "emerge conky" to install conky. 
-                       There is also usually an up-to-date ebuild within Conky's package or in CVS.
+                       
                </para>
        </refsect1>