dia r4078 - in trunk: . doc/en doc/eu doc/fr doc/pl

[hans svn gnome org]

Author: hans
Date: Sun Jun 29 15:07:57 2008
New Revision: 4078
URL: http://svn.gnome.org/viewvc/dia?rev=4078&view=rev

Log:
2008-06-29  Hans Breuer  <hans breuer org>

	* doc/fr/dia-cmdline.xml doc/eu/dia-1.xml : added, bug #465460
	* doc/eu/dia.1 : updated

	* configure.in bindings/Makefile.am : some more autotools trial and 
	error not fixing bug #540694 - help appreciated


Modified:
   trunk/ChangeLog
   trunk/doc/en/Makefile.am
   trunk/doc/eu/Makefile.am
   trunk/doc/fr/Makefile.am
   trunk/doc/pl/Makefile.am
   trunk/hardcopies.make

Modified: trunk/doc/en/Makefile.am
==============================================================================
--- trunk/doc/en/Makefile.am	(original)
+++ trunk/doc/en/Makefile.am	Sun Jun 29 15:07:57 2008
@@ -67,26 +67,6 @@
 	ps/graphics/color_selector.eps \
 	ps/graphics/preferences_fig.eps
 
-xmlsources = \
-	dia-1.xml \
-	dia-cmdline.xml \
-	authors.xml \
-	usage-customization.xml \
-	usage-layers.xml \
-	custom-shapes.xml \
-	dia.xml \
-	usage-loadsave.xml \
-	entities.xml \
-	usage-objects-basic.xml \
-	usage-objects-selecting.xml \
-	usage-objects-special.xml \
-	usage-objects.xml \
-	usage-quickstart.xml \
-	intro.xml \
-	license.xml \
-	usage-canvas.xml
-
-
 htmlstyle = \
 	html.xsl
 

Modified: trunk/doc/eu/Makefile.am
==============================================================================
--- trunk/doc/eu/Makefile.am	(original)
+++ trunk/doc/eu/Makefile.am	Sun Jun 29 15:07:57 2008
@@ -63,25 +63,6 @@
 
 epsfigures = 
 
-xmlsources = \
-	authors.xml \
-	usage-customization.xml \
-	usage-layers.xml \
-	dia.xml \
-	usage-loadsave.xml \
-	entities.xml \
-	usage-objects-basic.xml \
-	usage-objects-selecting.xml \
-	usage-objects-special.xml \
-	usage-objects.xml \
-	usage-quickstart.xml \
-	intro.xml \
-	license.xml \
-	usage-canvas.xml
-
-##	dia-cmdline.xml \
-##	dia-1.xml \
-
 htmlstyle = \
 	html.xsl
 

Modified: trunk/doc/fr/Makefile.am
==============================================================================
--- trunk/doc/fr/Makefile.am	(original)
+++ trunk/doc/fr/Makefile.am	Sun Jun 29 15:07:57 2008
@@ -67,26 +67,6 @@
 	ps/graphics/color_selector.eps \
 	ps/graphics/preferences_fig.eps
 
-xmlsources = \
-	dia-cmdline.xml \
-	dia-1.xml \
-	authors.xml \
-	usage-customization.xml \
-	usage-layers.xml \
-	custom-shapes.xml \
-	dia.xml \
-	usage-loadsave.xml \
-	entities.xml \
-	usage-objects-basic.xml \
-	usage-objects-selecting.xml \
-	usage-objects-special.xml \
-	usage-objects.xml \
-	usage-quickstart.xml \
-	intro.xml \
-	license.xml \
-	usage-canvas.xml
-
-
 htmlstyle = \
 	html.xsl
 

Modified: trunk/doc/pl/Makefile.am
==============================================================================
--- trunk/doc/pl/Makefile.am	(original)
+++ trunk/doc/pl/Makefile.am	Sun Jun 29 15:07:57 2008
@@ -64,26 +64,6 @@
 
 epsfigures = 
 
-xmlsources = \
-	authors.xml \
-	usage-customization.xml \
-	usage-layers.xml \
-	dia.xml \
-	usage-loadsave.xml \
-	usage-objects-selecting.xml \
-	usage-objects-special.xml \
-	usage-objects.xml \
-	usage-quickstart.xml \
-	intro.xml \
-	license.xml \
-	usage-canvas.xml
-
-##
-##	dia-cmdline.xml \
-##	usage-objects-basic.xml \
-##	entities.xml \
-##	dia-1.xml \
-
 htmlstyle = \
 	html.xsl
 

Modified: trunk/hardcopies.make
==============================================================================
--- trunk/hardcopies.make	(original)
+++ trunk/hardcopies.make	Sun Jun 29 15:07:57 2008
@@ -10,7 +10,10 @@
 ##
 ##
 
-sysdoc = $(DESTDIR)$(datadir)/doc/$(docname)/$(lang)
+sysdoc = $(DESTDIR)$(docdir)/$(lang)
+sysdoc_html = $(DESTDIR)$(htmldir)/html/$(lang)
+sysdoc_pdf = $(DESTDIR)$(pdfdir)/$(lang)
+sysdoc_ps = $(DESTDIR)$(psdir)/$(lang)
 
 if WITH_HTMLDOC
 htmldoc = $(progname)_html
@@ -48,7 +51,7 @@
 clean-local: clean-local-xml \
 	clean-html clean-ps clean-pdf
 
-$(progname)_html: $(progname).xml $(xmlsources) $(htmlstyle) $(pngfigures)
+$(progname)_html: $(progname).xml $(xml_files) $(htmlstyle) $(pngfigures)
 	$(mkinstalldirs) $(srcdir)/$(progname)_html
 	$(mkinstalldirs) $(srcdir)/$(progname)_html/$(figdir)
 	$(mkinstalldirs) $(srcdir)/$(progname)_html/images
@@ -65,7 +68,7 @@
 	touch $(progname)_html
 
 if WITH_PDFDOC
-$(progname).pdf: $(progname).xml $(xmlsources) $(pngfigures)
+$(progname).pdf: $(progname).xml $(xml_files) $(pngfigures)
 	-$(DBLATEX) -t pdf -T  native \
 		-P 'latex.unicode.use=$(UNICODE)' \
 		-P latex.encoding='$(ENCODING)' \
@@ -88,7 +91,7 @@
 	touch .epsfigures
 
 if WITH_PSDOC
-$(progname).ps: $(progname).xml $(xmlsources) .epsfigures
+$(progname).ps: $(progname).xml $(xml_files) .epsfigures
 	-$(DBLATEX) -t ps -T native \
 	        $(stylesheet) \
 		-P 'latex.unicode.use=$(UNICODE)' \
@@ -98,7 +101,7 @@
 endif
 
 if WITH_JW
-.jw: $(progname).xml $(xmlsources) .epsfigures
+.jw: $(progname).xml $(xml_files) .epsfigures
 	rm -rf jw
 	mkdir -p jw
 	cp -r graphics jw
@@ -117,26 +120,26 @@
 endif
 
 install-html: $(progname)_html
-	$(mkinstalldirs) $(sysdoc)/html
-	cp -r $(srcdir)/$(progname)_html/* $(sysdoc)/html
+	$(mkinstalldirs) $(sysdoc_html)
+	cp -r $(srcdir)/$(progname)_html/* $(sysdoc_html)
 
 uninstall-html:
-	-rm -f $(sysdoc)/html/*.html
-	-rm -f $(sysdoc)/html/$(figdir)/*
-	-rm -f $(sysdoc)/html/images/callouts/*
-	-rm -f $(sysdoc)/html/images/*
-	-rm -f $(sysdoc)/html/css/*
+	-rm -f $(sysdoc_html)/*.html
+	-rm -f $(sysdoc_html)/$(figdir)/*.png
+	-rm -f $(sysdoc_html)/images/callouts/*.png
+	-rm -f $(sysdoc_html)/images/*.png
+	-rm -f $(sysdoc_html)/css/*.css
 
 clean-html:
 	-rm -rf $(srcdir)/$(progname)_html
 
 
 install-pdf: $(progname).pdf
-	$(mkinstalldirs) $(sysdoc)
-	-$(INSTALL_DATA) $< $(sysdoc)/$<
+	$(mkinstalldirs) $(sysdoc_pdf)
+	-$(INSTALL_DATA) $< $(sysdoc_pdf)/$<
 
 uninstall-pdf:
-	-rm -f $(sysdoc)/$(progname).pdf
+	-rm -f $(sysdoc_pdf)/$(progname).pdf
 
 clean-pdf:
 	rm -f $(progname).pdf
@@ -144,11 +147,11 @@
 	rm -f .jw
 
 install-ps: $(progname).ps
-	$(mkinstalldirs) $(sysdoc)
-	-$(INSTALL_DATA) $< $(sysdoc)/$<
+	$(mkinstalldirs) $(sysdoc_ps)
+	-$(INSTALL_DATA) $< $(sysdoc_ps)/$<
 
 uninstall-ps:
-	-rm -f $(sysdoc)/$(progname).ps
+	-rm -f $(sysdoc_ps)/$(progname).ps
 
 clean-ps:
 	-rm -rf $(srcdir)/tex