pangomm r10 - in trunk: . docs docs/reference tools/m4

[murrayc svn gnome org]

Author: murrayc
Date: Sat Aug  2 09:34:36 2008
New Revision: 10
URL: http://svn.gnome.org/viewvc/pangomm?rev=10&view=rev

Log:
2008-08-01  Deng Xiyue <manphiz gmail com>

* docs/Makefile_web.am_fragment:
* docs/reference/Makefile.am:
* tools/m4/Makefile.am:
* Makefile.am: Fix all references of ABI version 2.4 to version 1.4, 
though the tarball version (as reported by pkgconfig --modversion) 
must stay as 2.x.
Bug #545537.

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/docs/Makefile_web.am_fragment
   trunk/docs/reference/Makefile.am
   trunk/tools/m4/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Aug  2 09:34:36 2008
@@ -35,7 +35,7 @@
 # This doesn't work very well in a $(srcdir) != $(builddir) setup,
 # but this target is for maintainer use only anyway.
 
-pangomm-2-4-docs.tar.gz:
+pangomm-1-4-docs.tar.gz:
 	tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@
 
 # Upload documentation:
@@ -45,8 +45,8 @@
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \
 	done
 
-post-html-local: pangomm-2-4-docs.tar.gz
-	rsync $(rsync_args) pangomm-2-4-docs.tar.gz $$USER $(web_host):$(web_path_pangomm)
+post-html-local: pangomm-1-4-docs.tar.gz
+	rsync $(rsync_args) pangomm-1-4-docs.tar.gz $$USER $(web_host):$(web_path_pangomm)
 
 post-html: post-html-recursive post-html-local
 

Modified: trunk/docs/Makefile_web.am_fragment
==============================================================================
--- trunk/docs/Makefile_web.am_fragment	(original)
+++ trunk/docs/Makefile_web.am_fragment	Sat Aug  2 09:34:36 2008
@@ -1,6 +1,6 @@
 web_host = gtkmm.org
-web_path_pangomm = /home/murrayc/gtkmm.org/docs/pangomm-2.4/
-#web_path_pangomm = /home/groups/g/gt/pangomm/htdocs/docs/pangomm-2.4/
+web_path_pangomm = /home/murrayc/gtkmm.org/docs/pangomm-1.4/
+#web_path_pangomm = /home/groups/g/gt/pangomm/htdocs/docs/pangomm-1.4/
 web_path_docs = $(web_path_pangomm)docs/
 
 #--delete and --delete-after are causing
@@ -13,5 +13,5 @@
 #rsync_args = -vz --rsh ssh --delete --delete-after
 rsync_args = -vz --rsh ssh
 
-pangomm_docdir = $(datadir)/doc/pangomm-2.4/docs
+pangomm_docdir = $(datadir)/doc/pangomm-1.4/docs
 

Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am	(original)
+++ trunk/docs/reference/Makefile.am	Sat Aug  2 09:34:36 2008
@@ -3,7 +3,7 @@
 doxygen_configfile = Doxyfile
 doxygen_configfile_source = $(srcdir)/Doxyfile.in
 beautify_docs = @GMMPROC_DIR@/beautify_docs.pl
-devhelp_file = pangomm-2.4.devhelp
+devhelp_file = pangomm-1.4.devhelp
 devhelp_stylesheet = doxygen_to_devhelp.xsl
 
 include $(top_srcdir)/docs/Makefile_web.am_fragment
@@ -63,7 +63,7 @@
 
 referencetopdir = $(pangomm_docdir)/reference
 referencedir = $(referencetopdir)/html
-devhelpdir = $(datadir)/devhelp/books/pangomm-2.4
+devhelpdir = $(datadir)/devhelp/books/pangomm-1.4
 
 hierarchy_to_install = widget_hierarchy.png widget_hierarchy.html
 

Modified: trunk/tools/m4/Makefile.am
==============================================================================
--- trunk/tools/m4/Makefile.am	(original)
+++ trunk/tools/m4/Makefile.am	Sat Aug  2 09:34:36 2008
@@ -5,6 +5,6 @@
 
 # Install the .m4, files:
 
-tools_m4_includedir = $(libdir)/pangomm-2.4/proc/m4
+tools_m4_includedir = $(libdir)/pangomm-1.4/proc/m4
 tools_m4_include_HEADERS = $(files_tools_m4)