--Boundary-00=_ceE7LfQXoP0qK2/ Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit On Thursday, May 13, 2010 14:00:04 Parker Coates wrote: > On Thu, May 13, 2010 at 12:04, Dawit A wrote: > > Any objection in me committing the attached patch to fix the location > > detection of docbook xsl style sheet in platforms that use version > > number in the path names, e.g. ArchLinux ? > > There's an issue with the file you attached. The contents when opened > here are just " [H [2J". Indeed... Dunno what happened there, but here is the right patch. --Boundary-00=_ceE7LfQXoP0qK2/ Content-Type: text/x-patch; charset="UTF-8"; name="cmake_FindDocBookXSL.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="cmake_FindDocBookXSL.patch" Index: FindDocBookXSL.cmake =================================================================== --- FindDocBookXSL.cmake (revision 1126296) +++ FindDocBookXSL.cmake (working copy) @@ -10,12 +10,24 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +set (STYLESHEET_PATH_LIST + share/xml/docbook/stylesheet/docbook-xsl + share/sgml/docbook/xsl-stylesheets + share/xml/docbook/stylesheet/nwalsh/current +) + +foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) + file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER} + ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-* + ) + if (STYLESHEET_SUFFIX_ITER) + list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER}) + endif () +endforeach () + find_path (DOCBOOKXSL_DIR VERSION PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES - share/xml/docbook/stylesheet/docbook-xsl - share/sgml/docbook/xsl-stylesheets - share/xml/docbook/stylesheet/nwalsh/current + PATH_SUFFIXES ${STYLESHEET_PATH_LIST} ) find_package_handle_standard_args (DocBookXSL --Boundary-00=_ceE7LfQXoP0qK2/--