Fix naming conventions in DocBook finder files

2 files changed, 24 insertions, 37 deletions

diff --git a/attic/modules/FindDocBookXML.cmake b/attic/modules/FindDocBookXML.cmake
index 26053bfd..8edc59d4 100644
--- a/attic/modules/FindDocBookXML.cmake
+++ b/attic/modules/FindDocBookXML.cmake
@@ -1,10 +1,10 @@
 # Try to find DocBook XML DTDs
 # Once done, it will define:
 #
-#  DOCBOOKXML_FOUND - system has the required DocBook XML DTDs
-#  DOCBOOKXML_CURRENTDTD_VERSION - the version of currently used DocBook XML
+#  DocBookXML_FOUND - system has the required DocBook XML DTDs
+#  DocBookXML_CURRENTDTD_VERSION - the version of currently used DocBook XML
 #     DTD
-#  DOCBOOKXML_CURRENTDTD_DIR - the directory containing the definition of
+#  DocBookXML_CURRENTDTD_DIR - the directory containing the definition of
 #     the currently used DocBook XML version
 
 # Copyright (c) 2010, Luigi Toscano, <luigi.toscano@tiscali.it>
@@ -12,56 +12,43 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-set (DOCBOOKXML_CURRENTDTD_VERSION "4.2"
+set (DocBookXML_CURRENTDTD_VERSION "4.2"
      CACHE INTERNAL "Required version of XML DTDs")
 
 set (DTD_PATH_LIST
-   share/xml/docbook/schema/dtd/${DOCBOOKXML_CURRENTDTD_VERSION}
-   share/xml/docbook/xml-dtd-${DOCBOOKXML_CURRENTDTD_VERSION}
-   share/sgml/docbook/xml-dtd-${DOCBOOKXML_CURRENTDTD_VERSION}
-   share/xml/docbook/${DOCBOOKXML_CURRENTDTD_VERSION}
+   share/xml/docbook/schema/dtd/${DocBookXML_CURRENTDTD_VERSION}
+   share/xml/docbook/xml-dtd-${DocBookXML_CURRENTDTD_VERSION}
+   share/sgml/docbook/xml-dtd-${DocBookXML_CURRENTDTD_VERSION}
+   share/xml/docbook/${DocBookXML_CURRENTDTD_VERSION}
 )
 
-find_path (DOCBOOKXML_CURRENTDTD_DIR docbookx.dtd
+find_path (DocBookXML_CURRENTDTD_DIR docbookx.dtd
    PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
    PATH_SUFFIXES ${DTD_PATH_LIST}
 )
 
-if (NOT DOCBOOKXML_CURRENTDTD_DIR)
+if (NOT DocBookXML_CURRENTDTD_DIR)
    # hacks for systems that use the package version in the DTD dirs,
    # e.g. Fedora, OpenSolaris
    set (DTD_PATH_LIST)
    foreach (DTD_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH})
       file(GLOB DTD_SUFFIX_ITER RELATIVE ${DTD_PREFIX_ITER}
-           ${DTD_PREFIX_ITER}/share/sgml/docbook/xml-dtd-${DOCBOOKXML_CURRENTDTD_VERSION}-*
+           ${DTD_PREFIX_ITER}/share/sgml/docbook/xml-dtd-${DocBookXML_CURRENTDTD_VERSION}-*
       )
       if (DTD_SUFFIX_ITER)
          list (APPEND DTD_PATH_LIST ${DTD_SUFFIX_ITER})
       endif ()
    endforeach ()
 
-   find_path (DOCBOOKXML_CURRENTDTD_DIR docbookx.dtd
+   find_path (DocBookXML_CURRENTDTD_DIR docbookx.dtd
       PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
       PATH_SUFFIXES ${DTD_PATH_LIST}
    )
-endif (NOT DOCBOOKXML_CURRENTDTD_DIR)
-
-#set (DOCBOOKXML_OLDDTD_DIR ${DOCBOOKXML_CURRENTDTD_DIR})
-#set (DOCBOOKXML_OLDDTD_VERSION "4.1.2")
-#set (DTD_PATH_LIST)
-#   share/xml/docbook/schema/dtd/${DOCBOOKXML_OLDDTD_VERSION}
-#   share/xml/docbook/xml-dtd-${DOCBOOKXML_OLDDTD_VERSION}
-#   share/sgml/docbook/xml-dtd-${DOCBOOKXML_OLDDTD_VERSION}
-#   share/xml/docbook/${DOCBOOKXML_OLDDTD_VERSION}
-#)
-#find_path (DOCBOOKXML_OLDDTD_DIR docbookx.dtd
-#   PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
-#   PATH_SUFFIXES ${DTD_PATH_LIST}
-#)
+endif (NOT DocBookXML_CURRENTDTD_DIR)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args (DocBookXML
-    "Could NOT find DocBook XML DTDs (v${DOCBOOKXML_CURRENTDTD_VERSION})"
-    DOCBOOKXML_CURRENTDTD_DIR DOCBOOKXML_CURRENTDTD_VERSION)
+    "Could NOT find DocBook XML DTDs (v${DocBookXML_CURRENTDTD_VERSION})"
+    DocBookXML_CURRENTDTD_DIR DocBookXML_CURRENTDTD_VERSION)
 
-mark_as_advanced (DOCBOOKXML_CURRENTDTD_DIR DOCBOOKXML_CURRENTDTD_VERSION)
+mark_as_advanced (DocBookXML_CURRENTDTD_DIR DocBookXML_CURRENTDTD_VERSION)
diff --git a/attic/modules/FindDocBookXSL.cmake b/attic/modules/FindDocBookXSL.cmake
index ab93c9ec..04530f43 100644
--- a/attic/modules/FindDocBookXSL.cmake
+++ b/attic/modules/FindDocBookXSL.cmake
@@ -1,8 +1,8 @@
 # Try to find DocBook XSL stylesheet
 # Once done, it will define:
 #
-#  DOCBOOKXSL_FOUND - system has the required DocBook XML DTDs
-#  DOCBOOKXSL_DIR - the directory containing the stylesheets
+#  DocBookXSL_FOUND - system has the required DocBook XML DTDs
+#  DocBookXSL_DIR - the directory containing the stylesheets
 #  used to process DocBook XML
 
 # Copyright (c) 2010, Luigi Toscano, <luigi.toscano@tiscali.it>
@@ -20,12 +20,12 @@ set (STYLESHEET_PATH_LIST
     share/xsl/docbook-xsl
 )
 
-find_path (DOCBOOKXSL_DIR lib/lib.xsl 
+find_path (DocBookXSL_DIR lib/lib.xsl
    PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
    PATH_SUFFIXES ${STYLESHEET_PATH_LIST}
 )
 
-if (NOT DOCBOOKXSL_DIR)
+if (NOT DocBookXSL_DIR)
    # hacks for systems that put the version in the stylesheet dirs
    set (STYLESHEET_PATH_LIST)
    foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH})
@@ -37,16 +37,16 @@ if (NOT DOCBOOKXSL_DIR)
       endif ()
    endforeach ()
 
-   find_path (DOCBOOKXSL_DIR VERSION
+   find_path (DocBookXSL_DIR VERSION
       PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
       PATH_SUFFIXES ${STYLESHEET_PATH_LIST}
    )
-endif (NOT DOCBOOKXSL_DIR)
+endif (NOT DocBookXSL_DIR)
 
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args (DocBookXSL
                                    "Could NOT find DocBook XSL stylesheets"
-                                   DOCBOOKXSL_DIR)
+                                   DocBookXSL_DIR)
 
-mark_as_advanced (DOCBOOKXSL_DIR)
+mark_as_advanced (DocBookXSL_DIR)