[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35371] trunk/blender: update 'make' GNUmakefile stub to run 'make install'

[Campbell Barton]

Revision: 35371
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35371
Author:   campbellbarton
Date:     2011-03-06 12:04:59 +0000 (Sun, 06 Mar 2011)
Log Message:
-----------
update 'make' GNUmakefile stub to run 'make install'
update packman and debian for to disable portable install option.

Modified Paths:
--------------
    trunk/blender/GNUmakefile
    trunk/blender/build_files/package_spec/debian/rules
    trunk/blender/build_files/package_spec/pacman/PKGBUILD

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile   2011-03-06 11:41:30 UTC (rev 35370)
+++ trunk/blender/GNUmakefile   2011-03-06 12:04:59 UTC (rev 35371)
@@ -75,7 +75,7 @@
 
        @echo 
        @echo Building Blender ...
-       cd $(BUILD_DIR) ; make -s -j $(NPROCS)
+       cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
        @echo 
        @echo run blender from "$(BUILD_DIR)/bin/blender"
        @echo 

Modified: trunk/blender/build_files/package_spec/debian/rules
===================================================================
--- trunk/blender/build_files/package_spec/debian/rules 2011-03-06 11:41:30 UTC 
(rev 35370)
+++ trunk/blender/build_files/package_spec/debian/rules 2011-03-06 12:04:59 UTC 
(rev 35371)
@@ -15,6 +15,7 @@
        # blender spesific CMake options
        dh_auto_configure -- \
                -DCMAKE_BUILD_TYPE:STRING=Release \
+               -DWITH_INSTALL_PORTABLE:BOOL=OFF \
                -DWITH_PYTHON_INSTALL:BOOL=OFF \
                -DWITH_OPENCOLLADA:BOOL=OFF
 

Modified: trunk/blender/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD      2011-03-06 
11:41:30 UTC (rev 35370)
+++ trunk/blender/build_files/package_spec/pacman/PKGBUILD      2011-03-06 
12:04:59 UTC (rev 35371)
@@ -47,8 +47,13 @@
   cmake $blender_srcdir \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_BUILD_TYPE:STRING=Release \
+    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
     -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF
+    -DWITH_OPENCOLLADA:BOOL=OFF \
+       -DPYTHON_VERSION:STRING=3.2 \
+       -DPYTHON_LIBPATH:STRING=/usr/lib \
+       -DPYTHON_LIBRARY:STRING=python3.2mu \
+       -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu
 
   make $MAKEFLAGS
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs