diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-26 17:34:17 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-26 17:34:17 +0400 |
| commit | b61abd4fe0da70ce52acf29c065df2af68e2eabe (patch) | |
| tree | 67eb2668ca92240580a62f4358f7bc464c938b2e /GNUmakefile | |
| parent | 43bb431548436b6b1699f795acd107de0f6b86a8 (diff) | |
| parent | 25a925ceabb9987c0204df32200b664dcc1aaf44 (diff) | |
Merge from trunk r49908-r50219smoke2
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 88ce32959af..f48ac5c2e41 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -19,9 +19,9 @@ # # ##### END GPL LICENSE BLOCK ##### -# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU` +# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU` # eg: -# ../build/Linux_i386 +# ../build_linux_i386 # This is for users who like to configure & build blender with a single command. @@ -40,7 +40,7 @@ ifndef BUILD_CMAKE_ARGS endif ifndef BUILD_DIR - BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE) + BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE) endif |