Skip to content

Commit

Permalink
Merge r231631 - [GTK] gtk-doc installation subdir duplicated
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=185468

Patch by Jan Alexander Steffens <jan.steffens@gmail.com> 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:
  • Loading branch information
heftig authored and carlosgcampos committed Jun 11, 2018
1 parent 3a972f5 commit f9227a4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions ChangeLog
@@ -1,3 +1,15 @@
2018-05-09 Jan Alexander Steffens <jan.steffens@gmail.com>

[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-18 Adrian Perez de Castro <aperez@igalia.com>

Unreviewed. Update OptionsWPE.cmake and NEWS for 2.20.0 release.
Expand Down
4 changes: 2 additions & 2 deletions Source/PlatformGTK.cmake
Expand Up @@ -15,10 +15,10 @@ list(APPEND DocumentationDependencies

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"
)
endif ()

Expand Down

0 comments on commit f9227a4

Please sign in to comment.