Bugfix: Setting path_headers_preserve should still honor path_headers setting.

When both path_headers_preserve and path_headers are provided, the path_headers should still be used.

diff --git a/build/scripts/bootstrap.sh b/build/scripts/bootstrap.sh
index e44bcab7e1a784904598bd6d46e24808e7c695d0..60e90fba70db838af2522dec6c3d3f3302b09fc5 100644 (file)
--- a/build/scripts/bootstrap.sh
+++ b/build/scripts/bootstrap.sh
@@ -843,6 +843,20 @@ bootstrap_operation_build() {
           fi
         fi
       done
+    elif [[ $path_headers_preserve == "yes" ]] ; then
+      for i in $sources_headers ; do
+        directory=$(dirname $i)
+
+        if [[ $directory == "." || $path_headers_preserve != "yes" ]] ; then
+          cp $verbose -f $path_c$i ${path_build}includes/$path_headers/ || failure=1
+        else
+          mkdir $verbose -p ${path_build}includes/$path_headers/$directory || failure=1
+
+          if [[ $failure == "" ]] ; then
+            cp $verbose -f $path_c$i ${path_build}includes/$path_headers/$i || failure=1
+          fi
+        fi
+      done
     else
       for i in $sources_headers ; do
         cp $verbose -f $path_c$i ${path_build}includes/$path_headers/ || failure=1