Explanations of builing and installing.

Explanations of new properties files locations and names.

3 files changed, 42 insertions, 13 deletions

diff --git a/README b/README
index 3ecba284c..9a2c0f0af 100644
--- a/README
+++ b/README
@@ -15,18 +15,29 @@ To build Scintilla, use the makefile located in the scintilla/gtk directory
 	make
 	cd ../..
 	
-To build SciTE, use the makefile located in the scite/gtk directory
+To build and install SciTE, use the makefile located in the scite/gtk directory
 	cd scite/gtk
 	make
-
-Install to /usr/local/bin
 	make install
 
-The current make file only supports static linking between SciTE and Scintilla.
+This installs SciTE into $prefix/bin. The value of $prefix is determined from
+the location of Gnome if it is installed. This is usually /usr if installed 
+with Linux or /usr/local if built from source. If Gnome is not installed 
+/usr/bin is used as the prefix. The prefix can be overridden on the command 
+line like "make prefix=/opt" but the same value should be used for both make 
+and make install as this location is compiled into the executable. The global 
+properties file is installed at $prefix/share/scite/SciTEGlobal.properties.
+
+If Gnome is installed then a .desktop file and icon are installed into the 
+correct Gnome places so that SciTE will be in the Gnome Applications menu.
 
-The SciTEGTK.properties file is better than the SciTEGlobal.properties for use 
-on Linux/GTK+ as it specifies fonts that are likely to be installed. 
-SciTE reads its SciTEGlobal.properties file from the user's home directory.
+To remove SciTE
+	make uninstall
+	
+To clean the object files which may be needed to change $prefix
+	make clean
+	
+The current make file only supports static linking between SciTE and Scintilla.
 
 
 *** Windows version ***
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 3262ae660..8cb6774cb 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -1077,18 +1077,36 @@ EM_SETTARGETDEVICE
       initialise Scintilla. The Sc1.exe target in the makefile demonstrates building a statically
       linked version of SciTE.
     </p>
+    <p>
+      To build everything, start in the directory that is above both scite and scintilla:<br />
+      <code>
+       cd scintilla\win32<br />
+       make<br />
+       cd ..\..<br />
+       cd scite\win32<br />
+       make<br />
+      </code>
+    </p>
     <h3>
        Building Scintilla with GTK+ on Linux
     </h3>
     <p>
        On Linux, Scintilla and SciTE have been built with GCC and linked with GTK+ 1.2x. GTK+ 1.0x
       will not work (and when it did it was very slow). The current make file only supports static
-      linking between SciTE and Scintilla. The gtk/makefile file is used to build SciTE, it can be
-      invoked as:<br />
+      linking between SciTE and Scintilla. The scintilla/gtk/makefile file is used to build Scintilla and 
+      the scite/gtk/makefile file is used to build SciTE. To build and install everything, start in the 
+      directory that is above both scite and scintilla:<br />
+      <code>
+       cd scintilla/gtk<br />
+       make<br />
+       cd ../..<br />
+       cd scite/gtk<br />
        make<br />
-       The SciTEGTK.properties file is better than the SciTEGlobal.properties for use on Linux/GTK+
-      as it specifies fonts that are likely to be installed. Under Linux, SciTE reads its
-      SciTEGlobal.properties file from the user's home directory.
+       make install<br />
+      </code><br />
+       The make install command searches for Gnome, and if found installs SciTE relative to Gnome
+       and places SciTE in the Gnome Applications menu. SciTE can be removed with make uninstall 
+       command.
     </p>
   </body>
 </html>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 8c75b73a1..7eb677f4a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -136,7 +136,7 @@
          Fixes crash in indentation guides when indent size set to 0.
       </li>
       <li>
-         Fixes to installation on Linux. User properties file has a dot at front of name:
+         Fixes to installation on GTK+/Linux. User properties file on GTK+ has a dot at front of name:
          .SciTEUser.properties. Global properties file location configurable at compile time
          defaulting to $prefix/share/scite. $prefix determined from Gnome if present else its
          /usr/local and can be overridden by installer. Gnome menu integration performed in