From 40970ce9150ee7599ffd646f75b154f734d53c4b Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 5 Jul 2011 20:27:07 +0100 Subject: [PATCH] dist: give 2.0 manual unique DOC_MODULE name The experimental 2.0 reference manual was setup with DOC_MODULE name of "cogl" which conflicted with the 1.x API manual. This meant that when running make install for both the reference manuals all the html files would end up bundled together in the same location. The 2.0 API reference now has a DOC_MODULE name of "cogl-2.0-experimental" the corresponding -sections.txt and -docs.xml.in files have also been renamed to match this. Signed-off-by: Neil Roberts --- configure.ac | 2 +- doc/reference/cogl-2.0-experimental/Makefile.am | 2 +- .../{cogl-docs.xml.in => cogl-2.0-experimental-docs.xml.in} | 0 .../{cogl-sections.txt => cogl-2.0-experimental-sections.txt} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename doc/reference/cogl-2.0-experimental/{cogl-docs.xml.in => cogl-2.0-experimental-docs.xml.in} (100%) rename doc/reference/cogl-2.0-experimental/{cogl-sections.txt => cogl-2.0-experimental-sections.txt} (100%) diff --git a/configure.ac b/configure.ac index cba739cf2..015101d00 100644 --- a/configure.ac +++ b/configure.ac @@ -937,7 +937,7 @@ doc/reference/Makefile doc/reference/cogl/Makefile doc/reference/cogl/cogl-docs.xml doc/reference/cogl-2.0-experimental/Makefile -doc/reference/cogl-2.0-experimental/cogl-docs.xml +doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml examples/Makefile po/Makefile.in ) diff --git a/doc/reference/cogl-2.0-experimental/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am index 441e276ee..051714935 100644 --- a/doc/reference/cogl-2.0-experimental/Makefile.am +++ b/doc/reference/cogl-2.0-experimental/Makefile.am @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=cogl +DOC_MODULE=cogl-2.0-experimental # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml diff --git a/doc/reference/cogl-2.0-experimental/cogl-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in similarity index 100% rename from doc/reference/cogl-2.0-experimental/cogl-docs.xml.in rename to doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in diff --git a/doc/reference/cogl-2.0-experimental/cogl-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt similarity index 100% rename from doc/reference/cogl-2.0-experimental/cogl-sections.txt rename to doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-sections.txt