path adjustments

[m6w6/btr] / share / btr / build / gnu.mk

diff --git a/share/btr/build/gnu.mk b/share/btr/build/gnu.mk
index 0047ab7d11b19b3d36d65b13bc36455592b26943..1246cb11b44544b09c7b874a3a927a5dae186091 100644 (file)
--- a/share/btr/build/gnu.mk
+++ b/share/btr/build/gnu.mk
@@ -18,28 +18,33 @@ clean: $(BTR_CONFIG_REPORT)
        fi;
 
 $(BTR_REPORT): $(BTR_TEST_REPORT)
-       if test -z "$(BTR_LAST_REPORT)"; then \
-               echo 0; \
-       elif test -s "$(BTR_LAST_REPORT)" -o -s "$(BTR_TEST_REPORT)"; then \
-               cmp $(BTR_LAST_REPORT) $(BTR_TEST_REPORT) 2>&1 || true; \
-       else \
-               echo 0; \
-       fi;
+       ( \
+               if test -z "$(BTR_LAST_REPORT)"; then \
+                       echo 0; \
+               elif test -s "$(BTR_LAST_REPORT)" -o -s "$(BTR_TEST_REPORT)"; then \
+                       cmp $(BTR_LAST_REPORT) $(BTR_TEST_REPORT) || true; \
+               else \
+                       echo 0; \
+               fi;
+       ) >$@ 2>&1
 
 $(BTR_TEST_REPORT): $(BTR_BUILD_REPORT)
        $(SAY) "Running checks..."
-       cd $(BTR_BUILD_DIR) && \
-               make check $(BTR_TEST_ARGS) >../$@ 2>&1
+       (cd $(BTR_BUILD_DIR) && \
+               make check $(BTR_TEST_ARGS) \
+       ) >$@ 2>&1
 
 $(BTR_BUILD_REPORT): $(BTR_CONFIG_REPORT)
        $(SAY) "Making build..."
-       cd $(BTR_BUILD_DIR) && \
-               make -j $(CPUS) >../$@ 2>&1
+       (cd $(BTR_BUILD_DIR) && \
+               make -j $(CPUS) \
+       ) >$@ 2>&1
        
 $(BTR_CONFIG_REPORT): $(BTR_BRANCH_DIR)/configure | $(BTR_BUILD_DIR) $(BTR_LOG_DIR)
        $(SAY) "Running configure..."
-       cd $(BTR_BUILD_DIR) && \
-               ../$(BTR_BRANCH_DIR)/configure -C $(BTR_BUILD_ARGS) >../$@ 2>&1
+       (cd $(BTR_BUILD_DIR) && \
+               ../../$(BTR_BRANCH_DIR)/configure -C $(BTR_BUILD_ARGS) \
+       ) >$@ 2>&1
 
 $(BTR_BUILD_DIR):
        mkdir -p $@