2007-11-06 Christian Dywan <christian@twotoasts.de>

        Reviewed by Darin.

        Fix http://bugs.webkit.org/show_bug.cgi?id=15828
        Bug 15828: WebKit GTK include and lib directory is installed in qt4-named directory

        * WebCore.pro: Use sane default install paths for the gtk port.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7be2f4c7167f48128fad19c943e5d4b2f2b9bbd2..480f5624154685592f8a3a40ab828a0990ef2d5c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-06  Christian Dywan  <christian@twotoasts.de>
+
+        Reviewed by Darin.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=15828
+        Bug 15828: WebKit GTK include and lib directory is installed in qt4-named directory
+
+        * WebCore.pro: Use sane default install paths for the gtk port.
+
 2007-11-06  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index f6a93c1a2ca8fb27348a7ae9bd04ce819b697038..1bdc921bfa6d6f54154c010c2264378a5b119842 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1625,8 +1625,8 @@ qt-port {
 }
 
 gtk-port {
-    isEmpty(WEBKIT_LIB_DIR):WEBKIT_LIB_DIR=$$[QT_INSTALL_LIBS]
-    isEmpty(WEBKIT_INC_DIR):WEBKIT_INC_DIR=$$[QT_INSTALL_HEADERS]/WebKitGtk
+    isEmpty(WEBKIT_LIB_DIR):WEBKIT_LIB_DIR=/usr/local/lib
+    isEmpty(WEBKIT_INC_DIR):WEBKIT_INC_DIR=/usr/local/include/WebKitGtk
 
     target.path = $$WEBKIT_LIB_DIR
     include($$PWD/../WebKit/gtk/Api/headers.pri)