From 0c1298f9727a2de61dd0d28944f4af5873a65668 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Jun 2011 16:00:32 +0000 Subject: avoid cd'ing with the makefile stub --- GNUmakefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 008dfe77eae..47073bf5734 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -64,21 +64,19 @@ endif # Build Blender all: - @echo + @echo @echo Configuring Blender ... if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ - mkdir -p $(BUILD_DIR) ; \ - cd $(BUILD_DIR) ; \ - cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \ + cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \ fi - @echo + @echo @echo Building Blender ... - cd $(BUILD_DIR) ; make -s -j $(NPROCS) install - @echo + make -C $(BUILD_DIR) -s -j $(NPROCS) install + @echo @echo run blender from "$(BUILD_DIR)/bin/blender" - @echo + @echo debug: all # pass @@ -91,7 +89,7 @@ package_pacman: cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot package_archive: - cd $(BUILD_DIR) ; make -s package_archive + make -C $(BUILD_DIR) -s package_archive @echo archive in "$(BUILD_DIR)/release" # forward build targets @@ -109,6 +107,6 @@ test_cmake: @echo "written: test_cmake_consistency.log" clean: - cd $(BUILD_DIR) ; make clean + make -C $(BUILD_DIR) clean .PHONY: all -- cgit v1.2.3