Fix README issue.

diff --git a/Makefile.am b/Makefile.am
index 874a4f5156206f8fa1810c6a03f5794baf421ad3..1d147a6dd6e7cabdec637f0b9101cf9b2ffa8cb2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
 
 # Dist docs from wiki.
-EXTRA_DIST = doc/ReadMe.wiki doc/UsbhidIssue.wiki
+EXTRA_DIST = doc/MakeRelease.wiki doc/ReadMe.wiki doc/UsbhidIssue.wiki
 
 # Release
 
@@ -90,6 +90,3 @@ release:
         -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION).tar.gz.sig
        googlecode_upload.py -s "$(PACKAGE) $(VERSION)" \
         -p $(PROJECT) -u $(USER) $(PACKAGE)-$(VERSION).tar.gz 
-       cp README ../wiki-$(PROJECT)/ReadMe.wiki && \
-               cd ../wiki-$(PROJECT) && \
-               svn commit -m Sync. ReadMe.wiki

diff --git a/README b/README
index cf390ead1128535d2edfa1eccc6b7793135c54f0..c8d0d090a92633b092ca4f790d44b57682ba1b4e 100644 (file)
--- a/README
+++ b/README
@@ -1,67 +1 @@
-#summary Installation of the Yubikey Personalization package
-#labels Featured,Phase-Deploy
-
-= Yubikey Personalization =
-
-The YubiKey Personalization package contains a library and command
-line tool used to personalize (i.e., set a AES key) YubiKeys.
-
-== Dependencies ==
-
-Yubico-c-client is needed, see http://code.google.com/p/yubico-c/
-
-Yubikey-personalization depends on libusb, so you will have to get it.
-Getting and installing them depends on your operating systems, here
-are example for a few flavors:
-
-  (Debian) apt-get install libusb-dev
-  (Fedora) yum install libusb-devel
-
-== Building from SVN ==
-
-Skip to the next section if you are using an official packaged
-version.
-
-You may check out the sources using SVN with the following command:
-
-{{{
-  svn checkout http://yubikey-personalization.googlecode.com/svn/trunk/ yubikey-personalization
-}}}
-
-This will create a directory 'yubikey-personalization'.  Enter the directory:
-
-{{{
-  cd yubikey-personalization
-}}}
-
-Autoconf, automake and libtool must be installed.
-
-Generate the build system using:
-
-{{{
-  autoreconf --install
-}}}
-
-== Building ==
-
-You will need to have libyubikey (yubikey.h, libyubikey.so) and libusb
-(usb.h, libusb.so) installed.  Get the libyubikey library from:
-
-http://code.google.com/p/yubico-c/
-
-The build system uses Autoconf, to set up the build system run:
-
-{{{
-  ./configure
-}}}
-
-Then build the code, run the self-test and install the binaries:
-
-{{{
-  make check install
-}}}
-
-== Feedback ==
-
-See the Google Group yubico-devel:
-http://groups.google.com/group/yubico-devel
+Documentation is in doc/ and in particular the doc/ReadMe.wiki file.