Build fix after r164148.

Tools:

* Scripts/webkitpy/port/base.py:
(Port._apache_config_file_name_for_platform):

LayoutTests:

* http/conf/apache2-httpd.conf: Removed.
* http/conf/apache2.2-httpd.conf: Copied from LayoutTests/http/conf/apache2-httpd.conf.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6fda42a2745f07e2b735bab1b835d30826a024f6..857f6ae28b084b11bddfe5676c3bf00e77855984 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix after r164148.
+
+        * http/conf/apache2-httpd.conf: Removed.
+        * http/conf/apache2.2-httpd.conf: Copied from LayoutTests/http/conf/apache2-httpd.conf.
+
 2014-02-14  Ryosuke Niwa  <rniwa@webkit.org>
 
         run-webkit-tests doesn't work with Apache 2.4

diff --git a/LayoutTests/http/conf/apache2-httpd.conf b/LayoutTests/http/conf/apache2.2-httpd.conf
similarity index 100%
rename from LayoutTests/http/conf/apache2-httpd.conf
rename to LayoutTests/http/conf/apache2.2-httpd.conf

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e0cbbd5325721e2c0d2684f2f4c9a35f93f72c74..931b85fc414b493b52320d9b77b935b2843e5083 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix after r164148.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._apache_config_file_name_for_platform):
+
 2014-02-14  Ryosuke Niwa  <rniwa@webkit.org>
 
         run-webkit-tests doesn't work with Apache 2.4

diff --git a/Tools/Scripts/webkitpy/port/base.py b/Tools/Scripts/webkitpy/port/base.py
index 3e008acc25086d99c0350b9537d187efb4d71535..e10fcc2203f0cb88b99c9b876729ed1a08500419 100644 (file)
--- a/Tools/Scripts/webkitpy/port/base.py
+++ b/Tools/Scripts/webkitpy/port/base.py
@@ -1088,7 +1088,7 @@ class Port(object):
             if self._is_arch_based():
                 return 'archlinux-httpd.conf'
         # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and prior, which we no longer support).
-        return 'httpd-' + self._apache_version() + '.conf'
+        return 'apache' + self._apache_version() + '-httpd.conf'
 
     def _path_to_apache_config_file(self):
         """Returns the full path to the apache configuration file.