[Lunar-commits] <moonbase> tbb: One more fiddle until I or some else finds an issue.

[Dennis `stumbles` Veatch]

commit 1a0265f88b6fdd09a21d4614128f4f6ceaaef7e3
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Dec 13 14:24:07 2011 -0500

    tbb: One more fiddle until I or some else finds an issue.
---
 zbeta/tbb/BUILD |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/zbeta/tbb/BUILD b/zbeta/tbb/BUILD
index 68a3eb8..90552ea 100644
--- a/zbeta/tbb/BUILD
+++ b/zbeta/tbb/BUILD
@@ -6,18 +6,17 @@
 
   make &&
   prepare_install &&
-  mkdir -p /usr/include/tbb &&
-  install `find include/tbb/ -name "*.h" -print` /usr/include/tbb/ &&
+  mkdir -p /usr/include/tbb/{machine,internal,compat}  &&
+  mkdir -p /usr/include/serial/tbb &&
+  install `find include/tbb/machine -name "*.h" -print` /usr/include/tbb/machine &&
+  install `find include/tbb/internal -name "*.h" -print` /usr/include/tbb/internal &&
+  install `find include/tbb/compat -name "*.h" -print` /usr/include/tbb/compat &&
+  install `find include/serial/tbb -name "*.h" -print` /usr/include/serial/tbb &&
+  install include/tbb/*.h /usr/include/tbb &&
+
   cd build/linux_intel*release &&
   install `find . -name "*.so*" -print` /usr/lib/ &&
 
-  mkdir -p /usr/include/tbb/machine  &&
-  mkdir -p /usr/include/tbb/internal &&
-  ln -sf /usr/include/tbb/linux_intel64.h /usr/include/tbb/machine/linux_intel64.h &&
-  ln -sf /usr/include/tbb/linux_common.h /usr/include/tbb/machine/linux_common.h   &&
-  ln -sf /usr/include/tbb/_concurrent_unordered_impl.h /usr/include/tbb/internal/_concurrent_unordered_impl.h &&
-  ln -sf /usr/include/tbb/_concurrent_queue_impl.h /usr/include/tbb/internal/_concurrent_queue_impl.h &&
-
   echo export TBBROOT=\"/usr\" > $SOURCE_DIRECTORY/tbb.rc &&
   echo export PATH=\"'${PATH}':'${TBBROOT}'/bin\" >> $SOURCE_DIRECTORY/tbb.rc &&