Revision: 34633
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34633
Author: campbellbarton
Date: 2011-02-04 04:12:24 +0000 (Fri, 04 Feb 2011)
Log Message:
-----------
fix for make stub, readlink was used incorrectly and building didn't work on
BSD because of CPU detection.
Modified Paths:
--------------
trunk/blender/GNUmakefile
Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile 2011-02-04 03:39:06 UTC (rev 34632)
+++ trunk/blender/GNUmakefile 2011-02-04 04:12:24 UTC (rev 34633)
@@ -32,7 +32,7 @@
# Source and Build DIR's
-BLENDER_DIR:=$(shell readlink $(PWD))
+BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS)_$(CPU)
@@ -45,10 +45,10 @@
NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print
$4}{next;}')
endif
ifeq ($(OS), FreeBSD)
- NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | awk '{print $3}')
+ NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
ifeq ($(OS), NetBSD)
- NPROCS:=$(shell sysctl -a | grep "hw.ncpu" | awk '{print $3}')
+ NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
@@ -58,7 +58,7 @@
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- mkdir --parents $(BUILD_DIR) ; \
+ mkdir -p $(BUILD_DIR) ; \
cd $(BUILD_DIR) ; \
cmake $(BLENDER_DIR) ; \
fi
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
