- updated man page from --help output.

- cmake now installs the man page.
- added cmake_linux_install.sh, shell script which downloads and builds blender.

4 files changed, 52 insertions, 7 deletions

diff --git a/build_files/cmake/example_scripts/cmake_linux_install.sh b/build_files/cmake/example_scripts/cmake_linux_install.sh
new file mode 100644
index 00000000000..7770efcf392
--- /dev/null
+++ b/build_files/cmake/example_scripts/cmake_linux_install.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# This shell script checks out and compiles blender, tested on ubuntu 10.04
+# assumes you have dependancies installed alredy
+
+# See this page for more info:
+#  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
+
+# grab blender
+mkdir ~/blender-svn 
+cd ~/blender-svn
+svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
+
+# create cmake dir
+mkdir ~/blender-svn/build-cmake
+cd ~/blender-svn/build-cmake
+
+# cmake without copying files for fast rebuilds
+# the files from svn will be used in place
+cmake ../blender -DWITH_INSTALL:BOOL=FALSE
+
+# make blender, will take some time
+make
+
+# link the binary to blenders source directory to run quickly
+ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
+
+# useful info
+echo ""
+echo "* Useful Commands *"
+echo "   Run Blender: ~/blender-svn/blender/blender.bin"
+echo "   Update Blender: svn up ~/blender-svn/blender"
+echo "   Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
+echo "   Build Blender: cd ~/blender-svn/build-cmake ; make"
+echo ""
+
+
diff --git a/doc/blender.1 b/doc/blender.1
index 43ac5638765..dd5e60ff900 100644
--- a/doc/blender.1
+++ b/doc/blender.1
@@ -1,4 +1,4 @@
-.TH "BLENDER" "1" "June 27, 2010" "Blender Blender 2\&.52 (sub 5) "
+.TH "BLENDER" "1" "July 15, 2010" "Blender Blender 2\&.52 (sub 5) "
 
 .SH NAME
 blender \- a 3D modelling and rendering package
@@ -317,11 +317,13 @@ Arguments are executed in the order they are given. eg
 .br
 .br
 .SH "ENVIRONMENT VARIABLES"
-  \fIHOME\fR Store files such as .blender/ .B.blend .Bfs .Blog here.
-  \fIBLENDERPATH\fR System directory to use for data files and scripts.
-                For this build of blender the default \fIBLENDERPATH\fR is...
-                "/usr/local/share/blender/2.5"
-                setting the \fIBLENDERPATH\fR will override this
+  \fIBLENDER_USER_CONFIG\fR Directory for user configuration files.
+  \fIBLENDER_SYSTEM_CONFIG\fR Directory for system wide configuration files.
+  \fIBLENDER_USER_SCRIPTS\fR Directory for user scripts.
+  \fIBLENDER_SYSTEM_SCRIPTS\fR Directory for system wide scripts.
+  \fIBLENDER_USER_DATAFILES\fR Directory for user data files (icons, translations, ..).
+  \fIBLENDER_SYSTEM_DATAFILES\fR Directory for system wide data files.
+  \fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries.
   \fITMP\fR or \fITMPDIR\fR Store temporary files here.
   \fIPYTHONHOME\fR Path to the python directory, eg. /usr/lib/python.
 .br
diff --git a/doc/blender.1.py b/doc/blender.1.py
index 05b491cf21e..7c7fc987c64 100644
--- a/doc/blender.1.py
+++ b/doc/blender.1.py
@@ -53,7 +53,7 @@ blender_version = blender_version.split("Build")[0]
 
 date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")
 
-filepath = os.path.splitext(__file__)[0] + ".1"
+filepath = os.path.splitext(__file__)[0]
 
 file = open(filepath, "w")
 
@@ -132,3 +132,5 @@ This manpage was written for a Debian GNU/Linux system by Daniel Mester
 <mester@uni-bremen.de> and updated by Cyril Brulebois
 <cyril.brulebois@enst-bretagne.fr> and Dan Eicher <dan@trollwerks.org>.
 ''')
+
+print("written:", filepath)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e9e6c982fde..812c001a2bb 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -200,6 +200,10 @@ IF(WITH_INSTALL)
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps
         )
 		INSTALL(
+            FILES ${CMAKE_SOURCE_DIR}/doc/blender.1
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/man
+        )
+		INSTALL(
             DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/
             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
             PATTERN ".svn" EXCLUDE