Fixed production builds for the iOS Simulator.

* Configurations/bmalloc.xcconfig: Include INSTALL_PATH_PREFIX in
PRIVATE_HEADERS_FOLDER_PATH when installing.

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

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index bb8080fd5eb0bb3bc8c5dd36b395827495da91d3..9ea567c964e75fec4b9660421c3cf13d8c503a2a 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-01  Dan Bernstein  <mitz@apple.com>
+
+        Fixed production builds for the iOS Simulator.
+
+        * Configurations/bmalloc.xcconfig: Include INSTALL_PATH_PREFIX in
+        PRIVATE_HEADERS_FOLDER_PATH when installing.
+
 2014-04-20  Geoffrey Garen  <ggaren@apple.com>
 
         bmalloc: Segregate pages by objects size

diff --git a/Source/bmalloc/Configurations/bmalloc.xcconfig b/Source/bmalloc/Configurations/bmalloc.xcconfig
index 6c05c41165530b9804e5ecdec9ac1c565f2e49ee..3fb91da82793e1002b549997c98149821170fcb0 100644 (file)
--- a/Source/bmalloc/Configurations/bmalloc.xcconfig
+++ b/Source/bmalloc/Configurations/bmalloc.xcconfig
@@ -23,7 +23,9 @@
 
 EXECUTABLE_PREFIX = lib;
 INSTALL_PATH_ACTUAL = /usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
+PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
+PRIVATE_HEADERS_FOLDER_PATH_NO = /usr/local/include/bmalloc;
+PRIVATE_HEADERS_FOLDER_PATH_YES = $(INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
 PRODUCT_NAME = bmalloc;
 
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;