-update docu to reflect current use of GNUNET_PREFIX

diff --git a/README b/README
index 1700c4f8e5e1cb349124fdce0fc2565ace50fee9..98d77b907d42837cc2087d1cf241dda669db5db8 100644 (file)
--- a/README
+++ b/README
@@ -78,10 +78,10 @@ recommend installing GNU libmicrohttpd (download from
 http://www.gnu.org/software/libmicrohttpd/).  Then you can start the
 actual GNUnet compilation and installation process with:
 
-$ export GNUNET_PREFIX=/usr/local # or other directory of your choice
+$ export GNUNET_PREFIX=/usr/local/lib # or other directory of your choice
 # addgroup gnunetdns
 # adduser gnunet gnunet
-# ./configure --prefix=$GNUNET_PREFIX --with-extractor=$LE_PREFIX
+# ./configure --prefix=$GNUNET_PREFIX/.. --with-extractor=$LE_PREFIX
 $ make
 # make install
 # sudo -u gnunet gnunet-arm -s
@@ -94,8 +94,8 @@ may not be installed in the perfect place or with the right
 permissions and thus won't work.
 
 This will create the users and groups needed for running GNUnet
-securely and then compile and install GNUnet to $GNUNET_PREFIX/bin/,
-$GNUNET_PREFIX/lib/ and $GNUNET_PREFIX/share/ and start the system
+securely and then compile and install GNUnet to $GNUNET_PREFIX/../bin/,
+$GNUNET_PREFIX/ and $GNUNET_PREFIX/../share/ and start the system
 with the default configuration.  It is strongly recommended that you
 add a user "gnunet" to run "gnunet-arm".  You can then still run the
 end-user applications as another user.
@@ -128,7 +128,7 @@ those plugins, so you might need to do some additional manual work to
 include those libraries in your binary package(s).  Similarly, if you
 want to use the GNUnet naming system and did NOT run GNUnet's 'make
 install' process with SUDO rights, the libraries will be installed to
-"$GNUNET_PREFIX/lib" and you will have to move them to "/lib/"
+"$GNUNET_PREFIX" and you will have to move them to "/lib/"
 manually.
 
 Finally, if you are compiling the code from subversion, you have to
@@ -163,7 +163,7 @@ about the GNU build process read the INSTALL file.
 
 GNUnet uses two types of configuration files, one that specifies the
 system-wide defaults (typically located in
-$GNUNET_PREFIX/share/gnunet/config.d/) and a second one that overrides
+$GNUNET_PREFIX/../share/gnunet/config.d/) and a second one that overrides
 default values with user-specific preferences.  The user-specific
 configuration file should be located in "~/.config/gnunet.conf" or its
 location can be specified by giving the "-c" option to the respective
@@ -236,18 +236,16 @@ and include the output with your bug reports.  More about how to
 report bugs can be found in the GNUnet FAQ on the webpage.  Submit
 patches via E-Mail to gnunet-developers@gnu.org.
 
-In order to run the unit tests with "make check", you need to
+In order to run the unit tests with by hand (instead of using
+"make check"), you need to
 set an environment variable ("GNUNET_PREFIX") to the directory
-where GNUnet is installed (usually, GNUnet will use OS specific
-tricks in order to try to figure out the PREFIX, but since the
-testcase binaries are not installed, that trick does not work
-for them).  Also, before running any testcases, you must
+where GNUnet's libraries are installed.
+Also, before running any testcases, you must
 complete the installation first.  Quick summary:
 
 $ ./configure --prefix=$SOMEWHERE
 $ make
 $ make install
-$ export GNUNET_PREFIX=$SOMEWHERE
 $ make check
 
 Some of the testcases require python >= 2.6 and pexpect to be