dia r4079 - trunk

[hans svn gnome org]

Author: hans
Date: Sun Jun 29 16:08:33 2008
New Revision: 4079
URL: http://svn.gnome.org/viewvc/dia?rev=4079&view=rev

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

	[Patch from Thomas Harding fixing help generation for non-gnome case]
	* xmldocs.make : without gnome install to $(helpdocdir)
	* configure.in : initialize HAVE_XSLTPROC
	* hardcopies.make : conditionalize on HAVE_GNOME


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/hardcopies.make
   trunk/xmldocs.make

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jun 29 16:08:33 2008
@@ -439,6 +439,12 @@
 dnl RedHat installs it in a version-numbered place.  Grumpf.
 AC_PATH_PROG(XSLTPROC, xsltproc, no)
 AM_CONDITIONAL(HAVE_DB2MAN, test "x$XSLTPROC" != xno)
+if test "x$XSLTPROC" != "xno" ; then
+  xsltproc=true
+else
+  xsltproc=false
+fi
+AM_CONDITIONAL(HAVE_XSLTPROC, $xsltproc)
 AC_SUBST(DB2MAN, "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl";)
 
 dnl Handling for Python

Modified: trunk/hardcopies.make
==============================================================================
--- trunk/hardcopies.make	(original)
+++ trunk/hardcopies.make	Sun Jun 29 16:08:33 2008
@@ -39,18 +39,40 @@
 ps_install = install-ps
 endif
 
+if HAVE_GNOME
 all: omf $(htmldoc) $(pdfdoc) $(psdoc)
 
 install-data-local: install-data-xml \
 	$(html_install) $(pdf_install) $(ps_install) install-examples
 
 uninstall-local: uninstall-local-xml  \
-	uninstall-html uninstall-pdf uninstall-ps \
-	uninstall-ps uninstall-pdf uninstall-examples
+	uninstall-html uninstall-pdf uninstall-ps uninstall-examples
 
 clean-local: clean-local-xml \
 	clean-html clean-ps clean-pdf
 
+else
+ 
+if HAVE_XSLTPROC
+all: $(progname)_html $(pdfdoc) $(psdoc)
+
+install-data-local: install-data-html \
+	install-html-nognome $(pdf_install) $(ps_install) install-examples
+ 
+uninstall-local: uninstall-local-html  \
+	uninstall-html-nognome uninstall-pdf uninstall-ps uninstall-examples
+else
+all: $(htmldoc) $(pdfdoc) $(psdoc)
+
+install-data-local: $(html_install) $(pdf_install) $(ps_install) install-examples
+ 
+uninstall-local: uninstall-html uninstall-pdf uninstall-ps uninstall-examples
+endif
+
+clean-local: clean-local-xml \
+	clean-html clean-ps clean-pdf
+endif
+
 $(progname)_html: $(progname).xml $(xml_files) $(htmlstyle) $(pngfigures)
 	$(mkinstalldirs) $(srcdir)/$(progname)_html
 	$(mkinstalldirs) $(srcdir)/$(progname)_html/$(figdir)
@@ -126,9 +148,22 @@
 uninstall-html:
 	-rm -f $(sysdoc_html)/*.html
 	-rm -f $(sysdoc_html)/$(figdir)/*.png
+	-rmdir $(sysdoc_html)/$(figdir)
 	-rm -f $(sysdoc_html)/images/callouts/*.png
+	-rmdir $(sysdoc_html)//images/callouts
 	-rm -f $(sysdoc_html)/images/*.png
+	-rmdir $(sysdoc_html)/images/
 	-rm -f $(sysdoc_html)/css/*.css
+	-rmdir $(sysdoc_html)/css
+	-rmdir $(sysdoc_html)
+
+install-html-nognome:
+	$(mkinstalldirs) $(DESTDIR)$(htmldir)/html/
+	-(cd $(DESTDIR)$(htmldir)/html/ && ln -s $(DESTDIR)$(helpdocdir) $(lang))
+
+uninstall-html-nognome:
+	-rm $(DESTDIR)$(htmldir)/html/$(lang)
+	-rmdir $(DESTDIR)$(htmldir)/html/
 
 clean-html:
 	-rm -rf $(srcdir)/$(progname)_html

Modified: trunk/xmldocs.make
==============================================================================
--- trunk/xmldocs.make	(original)
+++ trunk/xmldocs.make	Sun Jun 29 16:08:33 2008
@@ -38,8 +38,10 @@
 # This default value should work for most packages.
 if HAVE_GNOME
 helpdocdir = $(datadir)/gnome/help/$(docname)/$(lang)
+install-data-hook: install-data-hook-omf
 else
 helpdocdir = $(datadir)/$(docname)/help/$(lang)
+install-data-hook:
 endif
 
 # **********  You should not have to edit below this line  **********
@@ -78,10 +80,25 @@
 	  done \
 	fi
 
-install-data-hook: install-data-hook-omf
+install-data-html: $(progname)_html
+	$(mkinstalldirs) $(DESTDIR)$(helpdocdir)
+	cp -r $(srcdir)/$(progname)_html/* $(DESTDIR)$(helpdocdir)
 
 uninstall-local-xml: uninstall-local-doc uninstall-local-omf
 
+uninstall-local-html:
+	-rm -f $(DESTDIR)$(helpdocdir)/*.html
+	-rm -f $(DESTDIR)$(helpdocdir)/$(figdir)/*.png
+	-rmdir $(DESTDIR)$(helpdocdir)/$(figdir)
+	-rm -f $(DESTDIR)$(helpdocdir)/images/callouts/*.png
+	-rmdir $(DESTDIR)$(helpdocdir)/images/callouts
+	-rm -f $(DESTDIR)$(helpdocdir)/images/*.png
+	-rmdir $(DESTDIR)$(helpdocdir)/images/
+	-rm -f $(DESTDIR)$(helpdocdir)/css/*.css
+	-rmdir $(DESTDIR)$(helpdocdir)/css
+	-rmdir $(DESTDIR)$(helpdocdir)/*
+	-rmdir $(DESTDIR)$(helpdocdir)
+
 uninstall-local-doc:
 	-rm -f $(DESTDIR)$(helpdocdir)/$(figdir)/*
 	-rmdir $(DESTDIR)$(helpdocdir)/$(figdir)