Title: [155172] trunk/Source/ThirdParty/ANGLE
- Revision
- 155172
- Author
- m...@apple.com
- Date
- 2013-09-05 20:50:53 -0700 (Thu, 05 Sep 2013)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (155171 => 155172)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-09-06 03:50:08 UTC (rev 155171)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2013-09-06 03:50:53 UTC (rev 155172)
@@ -1,3 +1,13 @@
+2013-09-05 Dan Bernstein <m...@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 <ddkil...@apple.com>
ANGLE fails to build with trunk clang: error: 'register' storage class specifier is deprecated [-Werror,-Wdeprecated-register]
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig (155171 => 155172)
--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2013-09-06 03:50:08 UTC (rev 155171)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig 2013-09-06 03:50:53 UTC (rev 155172)
@@ -2,4 +2,6 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes