r18423 - gnucash-docs/trunk - Restore installation of html files (use install-html)

[John Ralls]

Author: jralls
Date: 2009-11-19 14:51:20 -0500 (Thu, 19 Nov 2009)
New Revision: 18423
Trac: http://svn.gnucash.org/trac/changeset/18423

Modified:
   gnucash-docs/trunk/ChangeLog
   gnucash-docs/trunk/xmldocs.make
Log:
Restore installation of html files (use install-html)

Modified: gnucash-docs/trunk/ChangeLog
===================================================================
--- gnucash-docs/trunk/ChangeLog	2009-11-18 18:25:55 UTC (rev 18422)
+++ gnucash-docs/trunk/ChangeLog	2009-11-19 19:51:20 UTC (rev 18423)
@@ -1,3 +1,18 @@
+2009-11-19  John Ralls  <john at manjusri.ceridwen.fremont.ca.us>
+
+	* xmldocs.make 
+	(install-html): New function, restores installation of html files
+	removed in r11631
+	(uninstall-local-doc): Fixed typo which caused
+	installed html files to not be uninstalled.
+
+2009-10-23  John Ralls  <john at manjusri.ceridwen.fremont.ca.us>
+
+	* xmldocs.make: Make install-data-hook-omf and uninstall-local-omf
+	conditional on configure variable ENABLE_SK
+	* configure.in: New variable ENABLE_SK, set by default, unset by
+	--disable-scrollkeeper. 
+	
 2007-07-14  Chris Lyttle  <chris at wilddev.net>
 
 	* configure.in: Update to release 2.2.0

Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make	2009-11-18 18:25:55 UTC (rev 18422)
+++ gnucash-docs/trunk/xmldocs.make	2009-11-19 19:51:20 UTC (rev 18423)
@@ -118,6 +118,23 @@
 
 install-data-hook: ${OMF_DATA_HOOK}
 
+install-html: html
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/$(docname);\
+	for file in $(docname)/*.html; do\
+	    basefile=`echo $$file | sed -e 's,^.*/,,'`;\
+	    $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(docname)/$$basefile;\
+	done
+	  $(mkinstalldirs) "$(DESTDIR)$(docdir)/$(docname)/$(figdir)"; \
+	  for file in $(docname)/$(figdir)/*.png; do \
+	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	 $(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$(docname)/$(figdir)/$$basefile"; \
+	  done
+	  $(mkinstalldirs) "$(DESTDIR)$(docdir)/$(docname)/stylesheet"; \
+	  for file in $(styledir)/*.png; do \
+	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	 $(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$(docname)/stylesheet/$$basefile"; \
+	  done
+
 uninstall-local: uninstall-local-doc ${UNINSTALL_OMF}
 
 uninstall-local-doc:
@@ -137,7 +154,7 @@
 	  for file in $(styledir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
 	    rm -f "$(DESTDIR)$(docdir)/$(docname)/stylesheet/$$basefile"; \
-	  done \
+	  done; \
 	  for file in $(srcdir)/$(docname)/*.html; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
 	    rm -f "$(DESTDIR)$(docdir)/$(docname)/$$basefile"; \