autogen.sh needs README

diff --git a/.gitignore b/.gitignore
index 8ae131e..ad9498c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,4 @@ conky-*.tar.*
 doc/*.html
 doc/*.mxml
 patches/
-README
 doc/conky.1

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..c5a86fd
--- /dev/null
+++ b/README
@@ -0,0 +1,37 @@
+QUICK & EASY:
+       $ sh autogen.sh
+       $ ./configure
+       $ make
+       $ ./src/conky # to run Conky
+       # make install
+
+First, read the README. This contains instructions specific to building conky
+fresh from the git repo:
+
+* 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 cloned conky from git,
+       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".
+
+       You can also try using the autogen.sh script, like so:
+
+       $ sh autogen.sh
+
+* After that, it's the familiar
+
+       $ ./configure
+       $ make
+       # make install
+
+       You might have to do the last step as root.

diff --git a/README.git-version b/README.git-version
deleted file mode 100644 (file)
index c5a86fd..0000000
--- a/README.git-version
+++ /dev/null
@@ -1,37 +0,0 @@
-QUICK & EASY:
-       $ sh autogen.sh
-       $ ./configure
-       $ make
-       $ ./src/conky # to run Conky
-       # make install
-
-First, read the README. This contains instructions specific to building conky
-fresh from the git repo:
-
-* 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 cloned conky from git,
-       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".
-
-       You can also try using the autogen.sh script, like so:
-
-       $ sh autogen.sh
-
-* After that, it's the familiar
-
-       $ ./configure
-       $ make
-       # make install
-
-       You might have to do the last step as root.