update 'make' GNUmakefile stub to run 'make install'
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 Mar 2011 12:04:59 +0000 (12:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 Mar 2011 12:04:59 +0000 (12:04 +0000)
update packman and debian for to disable portable install option.

GNUmakefile
build_files/package_spec/debian/rules
build_files/package_spec/pacman/PKGBUILD

index 0e1f57bd3dc15c2a7181b27890da1c69ba0b52fd..265826f31252a19c6d0e48c5e065db25194e6afe 100644 (file)
@@ -75,7 +75,7 @@ all:
 
        @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 
index 2991589916ec307133959bab432481458c737a81..14cc9e02ae40164cb926c9c792b9fb85e0330697 100755 (executable)
@@ -15,6 +15,7 @@ override_dh_auto_configure:
        # 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
 
index 5f7dd8b38ac3c01d5d837c643a0e24a739331ea2..988e246f0cc36ef614666f42cb198193ecd9b74f 100644 (file)
@@ -47,8 +47,13 @@ build() {
   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
 }