From 8ba024363f799801fe29a0b0834c9fc4ef7bb61a Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 1 Mar 2024 18:25:39 +0100 Subject: [PATCH] Fixed srcfile listing for asciidoc --- libexec/get_adoc_includes.sh | 4 +++- make/adoc2xml.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/get_adoc_includes.sh b/libexec/get_adoc_includes.sh index 20a88fd3b..c196aa21d 100755 --- a/libexec/get_adoc_includes.sh +++ b/libexec/get_adoc_includes.sh @@ -17,7 +17,9 @@ includes=$(basename "$main") function include_grep { local f - f=$(grep -E '^include::' $@ 2>/dev/null | sed 's/.*::\.\/\([^\[]*\).*/\1/g' 2>/dev/null) +# f=$(grep -E '^include::' $@ 2>/dev/null | sed 's/.*::\.\/\([^\[]*\).*/\1/g' 2>/dev/null) + f=$(grep -E '^include::' $@ 2>/dev/null | sed 's/.*::\([^\[]*\).*/\1/g' 2>/dev/null) + if [[ -n $f ]]; then includes+=" $f" include_grep $f diff --git a/make/adoc2xml.mk b/make/adoc2xml.mk index 4188fe702..55d4036d3 100644 --- a/make/adoc2xml.mk +++ b/make/adoc2xml.mk @@ -98,7 +98,7 @@ endif # ADOC_DOCINFO := $(addsuffix -docinfo.xml,$(basename $(ADOC_MAIN))) -ADOC_SRCFILES := $(wildcard $(addprefix $(ADOC_SRC_DIR)/,$(shell $(LIBEXEC_DIR)/get_adoc_includes.sh $(ADOC_MAIN)))) $(wildcard $(ADOC_DOCINFO)) +ADOC_SRCFILES := $(realpath $(wildcard $(addprefix $(ADOC_SRC_DIR)/,$(shell $(LIBEXEC_DIR)/get_adoc_includes.sh $(ADOC_MAIN)))) $(wildcard $(ADOC_DOCINFO))) all: $(MAIN)