gimp-help-2 r2571 - trunk

[romanofski svn gnome org]

Author: romanofski
Date: Fri Oct  3 14:28:32 2008
New Revision: 2571
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2571&view=rev

Log:

2008-10-03  Roman Joost  <romanofski gimp org>

	* configure.ac: bumped to version 2.4.2
	* Makefile.am: fixes which lead to errors for creating new
	release


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Oct  3 14:28:32 2008
@@ -53,6 +53,8 @@
 	stylesheets/zh_CN/gimp-help-custom.css
 
 XSL_FILES = \
+	stylesheets/authors.xml \
+	stylesheets/authors.dtd \
 	stylesheets/authors_docbook.xsl \
 	stylesheets/authors_text.xsl \
 	stylesheets/makeindex.xsl \
@@ -69,7 +71,7 @@
 	$(XML_FILES)			\
 	$(XSL_FILES)
 
-AUTHORS_DOCBOOK_XML = src/preface/authors.xml
+AUTHORS_DOCBOOK_XML = $(top_srcdir)/src/preface/authors.xml
 
 DISTCHECK_CONFIGURE_FLAGS = --without-gimp
 
@@ -343,7 +345,7 @@
 
 #### AUTHORS file creation
 
-AUTHORS: stylesheets/authors.xml stylesheets/authors_text.xsl $(AUTHORS_DOCBOOK_XML)
+AUTHORS: $(top_srcdir)/stylesheets/authors.xml stylesheets/authors_text.xsl $(AUTHORS_DOCBOOK_XML)
 	@echo "Creating $@"
 	@$(XSLTPROC) \
 	  $(XSLTFLAGS) \
@@ -351,7 +353,7 @@
 	  $< \
 	  > $@
 	
-$(AUTHORS_DOCBOOK_XML): stylesheets/authors.xml src/preface/titles.xml stylesheets/authors_*.xsl
+$(AUTHORS_DOCBOOK_XML): $(top_srcdir)/stylesheets/authors.xml src/preface/titles.xml $(top_srcdir)/stylesheets/authors_*.xsl
 	@echo "Creating $@"
 	@$(XSLTPROC) \
 	  $(XSLTFLAGS) \
@@ -401,7 +403,7 @@
 check-local: validate
 
 if GIMP_HELP_BUILD
-all-local: validate html-local index AUTHORS
+all-local: validate AUTHORS html-local index
 endif
 
 dist-hook: dist-copy-images

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Oct  3 14:28:32 2008
@@ -6,7 +6,7 @@
 
 m4_define([help_major_version], [2])
 m4_define([help_minor_version], [4])
-m4_define([help_micro_version], [1])
+m4_define([help_micro_version], [2])
 
 m4_define([help_version], [help_major_version.help_minor_version.help_micro_version])