INSTALL_PATH_PREFIX is used even when not installing
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Sep 2013 03:50:53 +0000 (03:50 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Sep 2013 03:50:53 +0000 (03:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120818

Reviewed by Darin Adler.

* Configurations/ANGLE.xcconfig: Changed the definition of PRIVATE_HEADERS_FOLDER_PATH
to include INSTALL_PATH_PREFIX only when installing.

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

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig

index 2534ee3..6e9cd73 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-05  Dan Bernstein  <mitz@apple.com>
+
+        INSTALL_PATH_PREFIX is used even when not installing
+        https://bugs.webkit.org/show_bug.cgi?id=120818
+
+        Reviewed by Darin Adler.
+
+        * Configurations/ANGLE.xcconfig: Changed the definition of PRIVATE_HEADERS_FOLDER_PATH
+        to include INSTALL_PATH_PREFIX only when installing.
+
 2013-08-17  David Kilzer  <ddkilzer@apple.com>
 
         ANGLE fails to build with trunk clang: error: 'register' storage class specifier is deprecated [-Werror,-Wdeprecated-register]
index 6d4d0c6..803dbbc 100644 (file)
@@ -2,4 +2,6 @@ PRODUCT_NAME = ANGLE;
 
 HEADER_SEARCH_PATHS = include src;
 INSTALL_PATH_ACTUAL = /usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;
+PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
+PUBLIC_HEADERS_FOLDER_PATH_NO = /usr/local/include/ANGLE;
+PUBLIC_HEADERS_FOLDER_PATH_YES = $(INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;