Merge pull request #22225 from maribu/dist/tools/riotboot_gen_hdr/build_dir

dist/tools/riotboot_gen_hdr: use $BUILD_DIR to build in

Author: maribu

dist/tools/riotboot_gen_hdr/Makefile

@@ -1,4 +1,6 @@
 RIOTBASE       := ../../..
+BUILD_DIR      ?= $(RIOTBASE)/build
+GENHDR_BINDIR  := $(BUILD_DIR)/genhdr
 RIOT_INCLUDE   := $(RIOTBASE)/sys/include
 RIOT_CORE_INC  := $(RIOTBASE)/core/include
 NATIVE_INCLUDE := $(RIOTBASE)/cpu/native/include
@@ -26,16 +28,16 @@ else
   Q=
 endif
 
-all: bin/genhdr
+all: $(GENHDR_BINDIR)/genhdr
 
-bin/:
-	$(Q)mkdir -p bin
+$(GENHDR_BINDIR)/:
+	$(Q)mkdir -p "$@"
 
-bin/genhdr: $(GENHDR_HDR) $(GENHDR_SRC) Makefile | bin/
+$(GENHDR_BINDIR)/genhdr: $(GENHDR_HDR) $(GENHDR_SRC) Makefile | $(GENHDR_BINDIR)/
 	$(Q)$(CC) $(CFLAGS) -I$(RIOT_INCLUDE) -I$(RIOT_CORE_INC) \
 		-I$(NATIVE_INCLUDE) $(GENHDR_SRC) -o $@
 
 clean:
-	$(Q)rm -rf bin/
+	$(Q)rm -rf $(GENHDR_BINDIR)
 
 distclean: clean

makefiles/boot/riotboot.mk

@@ -7,8 +7,8 @@ RIOTBOOT_DIR = $(RIOTBASE)/bootloaders/riotboot
 RIOTBOOT ?= $(RIOTBOOT_DIR)/bin/$(BOARD)/riotboot.elf
 CFLAGS += -I$(BINDIR)/riotbuild
 
-HEADER_TOOL_DIR = $(RIOTBASE)/dist/tools/riotboot_gen_hdr
-HEADER_TOOL ?= $(HEADER_TOOL_DIR)/bin/genhdr
+HEADER_TOOL_DIR = $(RIOTTOOLS)/riotboot_gen_hdr
+HEADER_TOOL ?= $(BUILD_DIR)/genhdr/genhdr
 BINDIR_RIOTBOOT = $(BINDIR)/riotboot_files
 
 $(BINDIR_RIOTBOOT): $(CLEAN)
@@ -58,6 +58,7 @@ $(HEADER_TOOL): FORCE
 	$(Q)/usr/bin/env -i \
 		QUIET=$(QUIET) \
 		PATH="$(PATH)" \
+		BUILD_DIR="$(BUILD_DIR)" \
 			$(MAKE) --no-print-directory -C $(HEADER_TOOL_DIR) all
 
 # Generate RIOT header and keep the original binary file