Missing closing parenthesis when determining INSTALL_PATH build setting in WebCore...
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Apr 2018 23:23:00 +0000 (23:23 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 25 Apr 2018 23:23:00 +0000 (23:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184999

Reviewed by Tim Horton.

Tweaks a line in WebCore.xcconfig that computes INSTALL_PATH, so that it doesn't use WK_NOT or WK_EMPTY.

* Configurations/WebCore.xcconfig:

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

Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig

index 7a6d28b..f0c4b07 100644 (file)
@@ -1,3 +1,14 @@
+2018-04-25  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Missing closing parenthesis when determining INSTALL_PATH build setting in WebCore.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=184999
+
+        Reviewed by Tim Horton.
+
+        Tweaks a line in WebCore.xcconfig that computes INSTALL_PATH, so that it doesn't use WK_NOT or WK_EMPTY.
+
+        * Configurations/WebCore.xcconfig:
+
 2018-04-25  Zalan Bujtas  <zalan@apple.com>
 
         [LFC] Implement LayoutContexet::layout() and its dependencies.
index bb1524d..6e6a244 100644 (file)
@@ -50,9 +50,9 @@ LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $
 HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
 INFOPLIST_FILE = Info.plist;
 
-INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
-INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_COCOA_TOUCH_NO = $(WEBCORE_FRAMEWORKS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_$(WK_COCOA_TOUCH));
+INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR);
 
 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
 DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;