rename from libsoup to libsoup-2.4 (TARGET_DIR): don't need to override

	* docs/reference/Makefile.am (DOC_MODULE): rename from libsoup to
	libsoup-2.4
	(TARGET_DIR): don't need to override this now

	* docs/reference/libsoup-2.4.types:
	* docs/reference/libsoup-2.4-docs.txt:
	* docs/reference/libsoup-2.4-overrides.txt:
	* docs/reference/libsoup-2.4-sections.txt: Rename these from
	unversioned, to match DOC_MODULE

	Fixes doc installation to work with devhelp again. #518384, Mart
	Raudsepp.

svn path=/trunk/; revision=1095

diff --git a/ChangeLog b/ChangeLog
index 9793914..218faf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-02-25  Dan Winship  <danw@gnome.org>
+
+       * docs/reference/Makefile.am (DOC_MODULE): rename from libsoup to
+       libsoup-2.4
+       (TARGET_DIR): don't need to override this now
+
+       * docs/reference/libsoup-2.4.types:
+       * docs/reference/libsoup-2.4-docs.txt:
+       * docs/reference/libsoup-2.4-overrides.txt:
+       * docs/reference/libsoup-2.4-sections.txt: Rename these from
+       unversioned, to match DOC_MODULE
+
+       Fixes doc installation to work with devhelp again. #518384, Mart
+       Raudsepp.
+
 2008-02-25  Benjamin Otte  <otte@gnome.org>
 
        * libsoup/soup-address.h:

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 9409f04..87015cb 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -2,7 +2,7 @@
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module
-DOC_MODULE=libsoup
+DOC_MODULE=libsoup-2.4
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -60,9 +60,6 @@ GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make
 
-# Override
-override TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-$(SOUP_API_VERSION)
-
 # kludges
 tmpl/*.sgml:
 

diff --git a/docs/reference/libsoup-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
similarity index 100%
rename from docs/reference/libsoup-docs.sgml
rename to docs/reference/libsoup-2.4-docs.sgml

diff --git a/docs/reference/libsoup-overrides.txt b/docs/reference/libsoup-2.4-overrides.txt
similarity index 100%
rename from docs/reference/libsoup-overrides.txt
rename to docs/reference/libsoup-2.4-overrides.txt

diff --git a/docs/reference/libsoup-sections.txt b/docs/reference/libsoup-2.4-sections.txt
similarity index 100%
rename from docs/reference/libsoup-sections.txt
rename to docs/reference/libsoup-2.4-sections.txt

diff --git a/docs/reference/libsoup.types b/docs/reference/libsoup-2.4.types
similarity index 100%
rename from docs/reference/libsoup.types
rename to docs/reference/libsoup-2.4.types