Title: [162983] tags/Safari-538.14.1/Source/WebKit2
- Revision
- 162983
- Author
- matthew_han...@apple.com
- Date
- 2014-01-28 16:48:17 -0800 (Tue, 28 Jan 2014)
Log Message
Merge r162977: <rdar://problem/15930116>
Modified Paths
Diff
Modified: tags/Safari-538.14.1/Source/WebKit2/ChangeLog (162982 => 162983)
--- tags/Safari-538.14.1/Source/WebKit2/ChangeLog 2014-01-29 00:42:12 UTC (rev 162982)
+++ tags/Safari-538.14.1/Source/WebKit2/ChangeLog 2014-01-29 00:48:17 UTC (rev 162983)
@@ -1,3 +1,16 @@
+2014-01-28 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r162977: <rdar://problem/15930116>
+
+ 2014-01-28 Andy Estes <aes...@apple.com>
+
+ [iOS] Set INSTALL_PATH_ACTUAL when building WebKit2 for the iOS Simulator
+ https://bugs.webkit.org/show_bug.cgi?id=127811
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebKit2.xcconfig:
+
2014-01-28 Babak Shafiei <bshaf...@apple.com>
Merge r162881
Modified: tags/Safari-538.14.1/Source/WebKit2/Configurations/WebKit2.xcconfig (162982 => 162983)
--- tags/Safari-538.14.1/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-01-29 00:42:12 UTC (rev 162982)
+++ tags/Safari-538.14.1/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-01-29 00:48:17 UTC (rev 162983)
@@ -27,6 +27,8 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
+INSTALL_PATH_ACTUAL_iphonesimulator = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
