Fixed srcfile listing for asciidoc

openSUSE · Mar 7, 2024 · 8ba0243 · 8ba0243
1 parent 7a9820e
commit 8ba0243
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)