commit b1d3f65ac2663a8effbf363b3b31a587c13cda00
author Andreas Schneider <asn@cryptomilk.org> Mon May 25 17:03:17 2020 +0200
committer Bruno Martins <bgcngm@gmail.com> Mon May 25 23:52:52 2020 +0200
tree a134a6840e2f8a37dccc5f134f70b9a89009bcd6
parent 48917cc909c9b5a5548d822c59a173fa501686f3

extract-utils: Fix usage for ETC files which need sub_dir

Thanks to Tad.

Change-Id: I6a0e7978afce6444d0827f97d7686f23aa7500c9

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 7b6e9cc..657bacb 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -456,11 +456,16 @@
             printf '\t\tenabled: false,\n'
             printf '\t},\n'
         fi
-        if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ] || [ "$CLASS" = "ETC" ] ; then
+        if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ] ; then
             if [ "$DIRNAME" != "." ]; then
                 printf '\trelative_install_path: "%s",\n' "$DIRNAME"
             fi
         fi
+        if [ "$CLASS" = "ETC" ] ; then
+            if [ "$DIRNAME" != "." ]; then
+                printf '\tsub_dir: "%s",\n' "$DIRNAME"
+            fi
+        fi
         if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ] ; then
             printf '\tprefer: true,\n'
         fi