Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-07-20 10:05:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-20 10:05:47 +0400
commit74219d2704dfcc77c8530be47a626287ec1423a9 (patch)
tree40150ac899a18d757376107309546d38c9fc3157
parent0ed523a8dd66189bbef192ad37d90c9c462d5dc1 (diff)
patch [#28031] Minor typo in Blenlib
from Scott Giese (sgiese)
-rw-r--r--GNUmakefile4
-rw-r--r--source/blender/blenlib/intern/path_util.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index d1a60ce5e37..b6741d7e5f0 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -73,7 +73,7 @@ all:
@echo
@echo Building Blender ...
- make -C $(BUILD_DIR) -s -j $(NPROCS) install
+ $(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
@echo
@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
@@ -112,6 +112,6 @@ test_deprecated:
python3 source/tests/check_deprecated.py
clean:
- make -C $(BUILD_DIR) clean
+ $(MAKE) -C $(BUILD_DIR) clean
.PHONY: all
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 80b85661762..f89283178ec 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1680,7 +1680,7 @@ void BLI_where_am_i(char *fullname, const size_t maxlen, const char *name)
if(GetModuleFileName(0, fullname, maxlen)) {
if(!BLI_exists(fullname)) {
printf("path can't be found: \"%.*s\"\n", maxlen, fullname);
- MessageBox(NULL, "path constains invalid characters or is too long (see console)", "Error", MB_OK);
+ MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK);
}
return;
}