From 09e032e59fbf80fa1db9ac17eac6fc7ac51e9515 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 25 Oct 2020 19:44:38 -0600 Subject: Makefile: Remove possibly illegal characters from doxyplatform The CONFIG_MAINBOARD_PART_NUMBER string can have characters in it that don't work in the doxyplatform make script under sh, so change any non-alphanumeric characters to an underscore. Also strip all the quotes - they aren't needed. The spaces in the "QEMU x86 i440fx/piix4" platform are one example of this. Signed-off-by: Martin Roth Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Reviewed-on: https://review.coreboot.org/c/coreboot/+/46287 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Paul Fagerburg Reviewed-by: Marshall Dawson --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2705c66b51..1b7cb9b8d6 100644 --- a/Makefile +++ b/Makefile @@ -440,10 +440,10 @@ doxygen_simple: doxyplatform doxygen_platform: $(obj)/project_filelist.txt echo echo "Building doxygen documentation for $(CONFIG_MAINBOARD_PART_NUMBER)" - export DOXYGEN_OUTPUT_DIR="$(DOXYGEN_OUTPUT_DIR)/$(CONFIG_MAINBOARD_VENDOR)/$(CONFIG_MAINBOARD_PART_NUMBER)"; \ + export DOXYGEN_OUTPUT_DIR="$$( echo $(DOXYGEN_OUTPUT_DIR)/$(call strip_quotes, $(CONFIG_MAINBOARD_VENDOR))_$(call strip_quotes, $(CONFIG_MAINBOARD_PART_NUMBER)) | sed 's|[^A-Za-z0-9/]|_|g' )"; \ mkdir -p "$$DOXYGEN_OUTPUT_DIR"; \ export DOXYFILES="$$(cat $(obj)/project_filelist.txt | grep -v '\.ld$$' | sed 's/\.aml/\.dsl/' | tr '\n' ' ')"; \ - export DOXYGEN_PLATFORM="$(CONFIG_MAINBOARD_DIR) ($(CONFIG_MAINBOARD_PART_NUMBER)) version $(KERNELVERSION)"; \ + export DOXYGEN_PLATFORM="$(call strip_quotes, $(CONFIG_MAINBOARD_DIR)) \($(call strip_quotes, $(CONFIG_MAINBOARD_PART_NUMBER))\) version $(KERNELVERSION)"; \ $(DOXYGEN) Documentation/doxygen/Doxyfile.coreboot_platform doxyclean: doxygen-clean -- cgit v1.2.3