dia r4076 - in trunk: . doc/eu doc/html/images doc/html/images/callouts doc/pl

[hans svn gnome org]

Author: hans
Date: Fri Jun 27 11:49:30 2008
New Revision: 4076
URL: http://svn.gnome.org/viewvc/dia?rev=4076&view=rev

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

	[Second iteration on patch from Thomas Harding improving the 
	 documentation generation, now 'make distcheck' succeeds again.
	 fixing bug #539848]
	* doc/html/images/*.png doc/html/images/callouts/*.png : added
	the missing png images and callouts
	* doc/fr/dia-cmdline.xml : updated 
	* doc/eu/dia-1.xml : added (data out from dia.dbk)
	NOTE: don't know why an English man page is in "eu". 
	* doc/eu/dia.xml : added entities placeholders (commenteds out)
	for commandline/manpage content
	* hardcopies.make :
	- added $(DESTDIR) to $(sysdoc) path.
	- html: deleted insane ;) dependency on $(progname)-cmdline.xml, as 
	$(xmlsources) will list it in individual languages; rewritten 
	file-to-compile as 'first target' == $(progname).xml
	- pdf: deleted insane dependency on $(progname)-cmdline.xml
	- ps: the same...
	- pdf and ps dependencies,"jw" build way: the same...
	* omf.make : solved inconsistency in omf files path between
	install/uninstall [$(DESTDIR)]




Added:
   trunk/doc/html/images/blank.png   (contents, props changed)
   trunk/doc/html/images/callouts/
   trunk/doc/html/images/callouts/1.png   (contents, props changed)
   trunk/doc/html/images/callouts/10.png   (contents, props changed)
   trunk/doc/html/images/callouts/11.png   (contents, props changed)
   trunk/doc/html/images/callouts/12.png   (contents, props changed)
   trunk/doc/html/images/callouts/13.png   (contents, props changed)
   trunk/doc/html/images/callouts/14.png   (contents, props changed)
   trunk/doc/html/images/callouts/15.png   (contents, props changed)
   trunk/doc/html/images/callouts/2.png   (contents, props changed)
   trunk/doc/html/images/callouts/3.png   (contents, props changed)
   trunk/doc/html/images/callouts/4.png   (contents, props changed)
   trunk/doc/html/images/callouts/5.png   (contents, props changed)
   trunk/doc/html/images/callouts/6.png   (contents, props changed)
   trunk/doc/html/images/callouts/7.png   (contents, props changed)
   trunk/doc/html/images/callouts/8.png   (contents, props changed)
   trunk/doc/html/images/callouts/9.png   (contents, props changed)
   trunk/doc/html/images/caution.png   (contents, props changed)
   trunk/doc/html/images/draft.png   (contents, props changed)
   trunk/doc/html/images/home.png   (contents, props changed)
   trunk/doc/html/images/important.png   (contents, props changed)
   trunk/doc/html/images/next.png   (contents, props changed)
   trunk/doc/html/images/note.png   (contents, props changed)
   trunk/doc/html/images/prev.png   (contents, props changed)
   trunk/doc/html/images/tip.png   (contents, props changed)
   trunk/doc/html/images/toc-blank.png   (contents, props changed)
   trunk/doc/html/images/toc-minus.png   (contents, props changed)
   trunk/doc/html/images/toc-plus.png   (contents, props changed)
   trunk/doc/html/images/up.png   (contents, props changed)
   trunk/doc/html/images/warning.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/doc/eu/Makefile.am
   trunk/doc/eu/dia.xml
   trunk/doc/pl/html.xsl
   trunk/hardcopies.make
   trunk/omf.make

Modified: trunk/doc/eu/Makefile.am
==============================================================================
--- trunk/doc/eu/Makefile.am	(original)
+++ trunk/doc/eu/Makefile.am	Fri Jun 27 11:49:30 2008
@@ -39,9 +39,10 @@
 	usage-objects-selecting.xml \
 	usage-objects-special.xml \
 	usage-objects.xml \
-	usage-quickstart.xml \
-	dia-cmdline.xml \
-	dia-1.xml
+	usage-quickstart.xml
+
+##	dia-cmdline.xml \
+##	dia-1.xml
 
 
 EXTRA_DIST += \
@@ -63,8 +64,6 @@
 epsfigures = 
 
 xmlsources = \
-	dia-cmdline.xml \
-	dia-1.xml \
 	authors.xml \
 	usage-customization.xml \
 	usage-layers.xml \
@@ -80,6 +79,8 @@
 	license.xml \
 	usage-canvas.xml
 
+##	dia-cmdline.xml \
+##	dia-1.xml \
 
 htmlstyle = \
 	html.xsl

Modified: trunk/doc/eu/dia.xml
==============================================================================
--- trunk/doc/eu/dia.xml	(original)
+++ trunk/doc/eu/dia.xml	Fri Jun 27 11:49:30 2008
@@ -30,7 +30,9 @@
 
     <!ENTITY LICENSE SYSTEM "license.xml">
 
-    <!ENTITY DIA-1 SYSTEM "dia-1.xml">
+    <!-- placeholders for manpage chapter and content -->
+    <!-- <!ENTITY MANPAGE SYSTEM "dia-cmdline.xml"> -->
+    <!-- <!ENTITY DIA-1 SYSTEM "dia-1.xml"> -->
 
   ]>
 

Added: trunk/doc/html/images/blank.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/1.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/10.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/11.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/12.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/13.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/14.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/15.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/2.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/3.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/4.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/5.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/6.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/7.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/8.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/callouts/9.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/caution.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/draft.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/home.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/important.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/next.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/note.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/prev.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/tip.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/toc-blank.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/toc-minus.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/toc-plus.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/up.png
==============================================================================
Binary file. No diff available.

Added: trunk/doc/html/images/warning.png
==============================================================================
Binary file. No diff available.

Modified: trunk/doc/pl/html.xsl
==============================================================================
--- trunk/doc/pl/html.xsl	(original)
+++ trunk/doc/pl/html.xsl	Fri Jun 27 11:49:30 2008
@@ -37,4 +37,3 @@
 </xsl:attribute-set>
 
 </xsl:stylesheet>
-

Modified: trunk/hardcopies.make
==============================================================================
--- trunk/hardcopies.make	(original)
+++ trunk/hardcopies.make	Fri Jun 27 11:49:30 2008
@@ -10,7 +10,7 @@
 ##
 ##
 
-sysdoc = $(datadir)/doc/$(docname)/$(lang)
+sysdoc = $(DESTDIR)$(datadir)/doc/$(docname)/$(lang)
 
 if WITH_HTMLDOC
 htmldoc = $(progname)_html
@@ -48,8 +48,7 @@
 clean-local: clean-local-xml \
 	clean-html clean-ps clean-pdf
 
-$(progname)_html: $(progname)-cmdline.xml $(pngfigures) \
-	$(xmlsources) $(htmlstyle)
+$(progname)_html: $(progname).xml $(xmlsources) $(htmlstyle) $(pngfigures)
 	$(mkinstalldirs) $(srcdir)/$(progname)_html
 	$(mkinstalldirs) $(srcdir)/$(progname)_html/$(figdir)
 	$(mkinstalldirs) $(srcdir)/$(progname)_html/images
@@ -62,12 +61,11 @@
 	-cp $(srcdir)/$(figdir)/*.png $(srcdir)/$(progname)_html/$(figdir)
 	cd $(srcdir)/$(progname)_html \
 	  && xsltproc --stringparam graphic.default.extension png \
-	    ../$(htmlstyle) ../$(progname).xml
+	    ../$(htmlstyle) ../$<
 	touch $(progname)_html
 
 if WITH_PDFDOC
-$(progname).pdf: $(srcdir)/$(progname).xml $(progname)-cmdline.xml \
-	$(pngfigures) $(xmlsources)
+$(progname).pdf: $(progname).xml $(xmlsources) $(pngfigures)
 	-$(DBLATEX) -t pdf -T  native \
 		-P 'latex.unicode.use=$(UNICODE)' \
 		-P latex.encoding='$(ENCODING)' \
@@ -90,8 +88,7 @@
 	touch .epsfigures
 
 if WITH_PSDOC
-$(progname).ps: $(srcdir)/$(progname).xml \
-	$(progname)-cmdline.xml .epsfigures $(xmlsources)
+$(progname).ps: $(progname).xml $(xmlsources) .epsfigures
 	-$(DBLATEX) -t ps -T native \
 	        $(stylesheet) \
 		-P 'latex.unicode.use=$(UNICODE)' \
@@ -101,8 +98,7 @@
 endif
 
 if WITH_JW
-.jw: $(srcdir)/$(progname).xml \
-	$(progname)-cmdline.xml .epsfigures $(xmlsources)
+.jw: $(progname).xml $(xmlsources) .epsfigures
 	rm -rf jw
 	mkdir -p jw
 	cp -r graphics jw
@@ -111,11 +107,11 @@
 	cd jw && recode -d '$(DOCUMENT_ENCODING)..XML-standalone' *.xml
 	touch .jw
 
-$(progname).ps: jw
+$(progname).ps: .jw
 	cd jw && $(JW) -b ps -V paper-type=$(PAPERSIZE) $(progname).xml
 	cp jw/$(progname).ps .
 
-$(progname).pdf: jw
+$(progname).pdf: .jw
 	cd jw && $(JW) -b pdf -V paper-type=$(PAPERSIZE) $(progname).xml
 	cp jw/$(progname).pdf .
 endif

Modified: trunk/omf.make
==============================================================================
--- trunk/omf.make	(original)
+++ trunk/omf.make	Fri Jun 27 11:49:30 2008
@@ -26,7 +26,7 @@
 #       Version: 0.1.3 (last updated: March 20, 2002)
 #
 
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
+omf_dest_dir=$(DESTDIR)$(datadir)/omf/@PACKAGE@
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
 
 # At some point, it may be wise to change to something like this:
@@ -43,13 +43,13 @@
 	touch omf_timestamp
 
 install-data-hook-omf:
-	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+	$(mkinstalldirs) $(omf_dest_dir)
 	if test "$(omffile)"; then \
 	  for file in $(omffile); do \
-	    $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+	    $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
 	  done; \
 	fi
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \