Changeset 155172 in webkit

Timestamp:

Sep 5, 2013, 8:50:53 PM (12 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• Configurations/ANGLE.xcconfig (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig

@@ -3 +3 @@
 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;