Title: [231631] trunk
Revision
231631
Author
[email protected]
Date
2018-05-09 23:44:00 -0700 (Wed, 09 May 2018)

Log Message

[GTK] gtk-doc installation subdir duplicated
https://bugs.webkit.org/show_bug.cgi?id=185468

Patch by Jan Alexander Steffens <[email protected]> on 2018-05-09
Reviewed by Carlos Garcia Campos.

The GTK docs are installed into a duplicated subdir,
e.g. /usr/share/doc/gtk-doc/html/webkit2gtk-4.0/webkit2gtk-4.0.

* Source/PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (231630 => 231631)


--- trunk/ChangeLog	2018-05-10 06:39:01 UTC (rev 231630)
+++ trunk/ChangeLog	2018-05-10 06:44:00 UTC (rev 231631)
@@ -1,3 +1,15 @@
+2018-05-09  Jan Alexander Steffens  <[email protected]>
+
+        [GTK] gtk-doc installation subdir duplicated
+        https://bugs.webkit.org/show_bug.cgi?id=185468
+
+        Reviewed by Carlos Garcia Campos.
+
+        The GTK docs are installed into a duplicated subdir,
+        e.g. /usr/share/doc/gtk-doc/html/webkit2gtk-4.0/webkit2gtk-4.0.
+
+        * Source/PlatformGTK.cmake:
+
 2018-05-09  Michael Catanzaro  <[email protected]>
 
         Unreviewed. Bump WPE soname for good measure.

Modified: trunk/Source/PlatformGTK.cmake (231630 => 231631)


--- trunk/Source/PlatformGTK.cmake	2018-05-10 06:39:01 UTC (rev 231630)
+++ trunk/Source/PlatformGTK.cmake	2018-05-10 06:44:00 UTC (rev 231631)
@@ -15,13 +15,13 @@
 
 if (ENABLE_GTKDOC)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_VERSION}/html/webkit2gtk-${WEBKITGTK_API_VERSION}
-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkit2gtk-${WEBKITGTK_API_VERSION}"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
     )
     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_VERSION}
-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkitdomgtk-${WEBKITGTK_API_VERSION}"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
     )
     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_VERSION}/html/jsc-glib-${WEBKITGTK_API_VERSION}
-            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/jsc-glib-${WEBKITGTK_API_VERSION}"
+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
     )
 endif ()
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to