Put bmalloc headers in the right place

https://bugs.webkit.org/show_bug.cgi?id=131464

Reviewed by Mark Rowe.

../bmalloc:

* Configurations/bmalloc.xcconfig: Set PRIVATE_HEADERS_FOLDER_PATH to
specify that we don't just want to dump all of our generically-named
headers into /usr/local/include.

../WTF:

* wtf/FastMalloc.cpp: Use "<bmalloc/...>" syntax so we can find our
headers in <header-root>/usr/local/include/bmalloc/.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167048 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index ddd0fbaba0c9f5b4a8f26385da122520b09f0966..88dcda1612395cb1f8b1eb61908ba58998b804c6 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-09  Geoffrey Garen  <ggaren@apple.com>
+
+        Put bmalloc headers in the right place
+        https://bugs.webkit.org/show_bug.cgi?id=131464
+
+        Reviewed by Mark Rowe.
+
+        * wtf/FastMalloc.cpp: Use "<bmalloc/...>" syntax so we can find our
+        headers in <header-root>/usr/local/include/bmalloc/.
+
 2014-04-09  Geoffrey Garen  <ggaren@apple.com>
 
         Rolled back out r166972.

diff --git a/Source/WTF/wtf/FastMalloc.cpp b/Source/WTF/wtf/FastMalloc.cpp
index 5cb20b2d5bcad8d834defbf2ad8f458883207677..c8e5711a26df071fa9366fd160e4ee31a8db45ad 100644 (file)
--- a/Source/WTF/wtf/FastMalloc.cpp
+++ b/Source/WTF/wtf/FastMalloc.cpp
@@ -425,7 +425,7 @@ extern "C" WTF_EXPORT_PRIVATE const int jscore_fastmalloc_introspection = 0;
 
 #elif defined(USE_BMALLOC) && USE_BMALLOC // FORCE_SYSTEM_MALLOC
 
-#include "bmalloc.h"
+#include <bmalloc/bmalloc.h>
 
 namespace WTF {
 

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index c21ebf8a90d054592563bdd40465f4025d96a383..63385cefe56a366e57b25f02ee6c0af05b3f52d3 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,14 @@
+2014-04-09  Geoffrey Garen  <ggaren@apple.com>
+
+        Put bmalloc headers in the right place
+        https://bugs.webkit.org/show_bug.cgi?id=131464
+
+        Reviewed by Mark Rowe.
+
+        * Configurations/bmalloc.xcconfig: Set PRIVATE_HEADERS_FOLDER_PATH to
+        specify that we don't just want to dump all of our generically-named
+        headers into /usr/local/include.
+
 2014-04-08  Geoffrey Garen  <ggaren@apple.com>
 
         Made bmalloc more #include friendly

diff --git a/Source/bmalloc/Configurations/bmalloc.xcconfig b/Source/bmalloc/Configurations/bmalloc.xcconfig
index fb5c9883133d43f3ae58a2f2250b72d796380973..6c05c41165530b9804e5ecdec9ac1c565f2e49ee 100644 (file)
--- a/Source/bmalloc/Configurations/bmalloc.xcconfig
+++ b/Source/bmalloc/Configurations/bmalloc.xcconfig
@@ -23,6 +23,7 @@
 
 EXECUTABLE_PREFIX = lib;
 INSTALL_PATH_ACTUAL = /usr/local/lib;
+PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
 PRODUCT_NAME = bmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;