diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-04 07:12:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-04 07:12:24 +0300 |
| commit | ce5dc02c8c1b4738dd0f7ede35873e4ad6537814 (patch) | |
| tree | 438080acc3d3ba97c6814fe15338ff1219a49e8f /GNUmakefile | |
| parent | 4be95838947e0401fda2a67a867323718074ad86 (diff) | |
fix for make stub, readlink was used incorrectly and building didn't work on BSD because of CPU detection.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile index c246b40544c..eb21e0e167a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -32,7 +32,7 @@ CPU:=$(shell uname -m) # 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 @@ ifeq ($(OS), Darwin) 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 @@ all: @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 |