From: Michael Peters <mrpeters@library.in.gov>
Date: Tue, 13 Nov 2012 14:21:56 +0000 (-0500)
Subject: LP1077811 - Move Dojo installation instructions in server_installation.txt
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fmrpeters-isl%2Flp1077811;p=working%2FEvergreen.git

LP1077811 - Move Dojo installation instructions in server_installation.txt

Users have commented that having the dojo install instructions
prior to "make install" is confusing, since /openils likely does
not exist yet.

This moves the Dojo install to follow make install, and notates
that it is only needed for Git (non-tarball) installations.

Signed-off-by: Michael Peters <mrpeters@library.in.gov>
---

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 991eeceabc..1743533a28 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -57,19 +57,6 @@ source directory to generate the configure script and Makefiles:
 autoreconf -i
 ------------------------------------------------------------------------------
 
-After running `make install`, developers also need to install the Dojo Toolkit
-set of JavaScript libraries. The appropriate version of Dojo is included
-in Evergreen release tarballs. Developers should install the Dojo 1.3.3
-version of Dojo by issuing the following commands as the *opensrf* Linux
-account:
-
-[source, bash]
-------------------------------------------------------------------------------
-wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
-tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
-cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
-------------------------------------------------------------------------------
-
 Installing prerequisites
 ------------------------
 
@@ -178,6 +165,22 @@ cd /openils/var/web/xul
 ln -sf rel_name/server server
 ------------------------------------------------------------------------------
 
+Installing Dojo Toolkit
+---------------------------------------
+
+In git based installations, after running `make install`, developers also 
+need to install the Dojo Toolkit set of JavaScript libraries. The 
+appropriate version of Dojo is included in Evergreen release tarballs. 
+Developers should install the Dojo 1.3.3 version of Dojo by issuing the 
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
 Change ownership of the Evergreen files
 ---------------------------------------