r22471 - gnucash-docs/branches/2.4 - Add links for backwards compatibility with older yelp versions

[Geert Janssens]

Author: gjanssens
Date: 2012-10-28 10:34:22 -0400 (Sun, 28 Oct 2012)
New Revision: 22471
Trac: http://svn.gnucash.org/trac/changeset/22471

Modified:
   gnucash-docs/branches/2.4/guide/Makefile.am
   gnucash-docs/branches/2.4/help/Makefile.am
   gnucash-docs/branches/2.4/xmldocs.make
Log:
Add links for backwards compatibility with older yelp versions

This is a follow up on r22373 which fixes the help file locations
for newer yelp versions. That fix was incompatible with older
yelp versions. With the links in place, both old and new yelp
versions should properly find the help files.

This change is deliberately committed to the 2.4 branch only.
I is expected that the older yelp versions won't be used anymore
by the time the current trunk gets stable.

Modified: gnucash-docs/branches/2.4/guide/Makefile.am
===================================================================
--- gnucash-docs/branches/2.4/guide/Makefile.am	2012-10-28 14:34:12 UTC (rev 22470)
+++ gnucash-docs/branches/2.4/guide/Makefile.am	2012-10-28 14:34:22 UTC (rev 22471)
@@ -1,6 +1,6 @@
 SUBDIRS = C de_DE it_IT ja_JP
 
-gnomehelpdir = $(datadir)/gnome/help/gnucash-guide
+gnomehelpdir = $(datadir)/gnome/help
 
 if WITH_MOBI
   MOBI = mobi
@@ -28,5 +28,10 @@
 	  || eval $$failcom; \
 	done; test -z "$$fail"
 
+install-data-hook:
+	cd "$(DESTDIR)$(gnomehelpdir)"; \
+	ln -sf gnucash gnucash-guide
+
 uninstall-hook:
-	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(gnomehelpdir)"
+	rm -f "$(DESTDIR)$(gnomehelpdir)/gnucash-guide"
+	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(gnomehelpdir)/gnucash"

Modified: gnucash-docs/branches/2.4/help/Makefile.am
===================================================================
--- gnucash-docs/branches/2.4/help/Makefile.am	2012-10-28 14:34:12 UTC (rev 22470)
+++ gnucash-docs/branches/2.4/help/Makefile.am	2012-10-28 14:34:22 UTC (rev 22471)
@@ -1,6 +1,6 @@
 SUBDIRS = C de_DE it_IT
 
-gnomehelpdir = $(datadir)/gnome/help/gnucash-help
+gnomehelpdir = $(datadir)/gnome/help
 
 if WITH_MOBI
   MOBI = mobi
@@ -28,5 +28,10 @@
 	  || eval $$failcom; \
 	done; test -z "$$fail"
 
+install-data-hook:
+	cd "$(DESTDIR)$(gnomehelpdir)"; \
+	ln -sf gnucash gnucash-help
+
 uninstall-hook:
-	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(gnomehelpdir)"
+	rm -f "$(DESTDIR)$(gnomehelpdir)/gnucash-help"
+	rmdir --ignore-fail-on-non-empty "$(DESTDIR)$(gnomehelpdir)/gnucash"

Modified: gnucash-docs/branches/2.4/xmldocs.make
===================================================================
--- gnucash-docs/branches/2.4/xmldocs.make	2012-10-28 14:34:12 UTC (rev 22470)
+++ gnucash-docs/branches/2.4/xmldocs.make	2012-10-28 14:34:22 UTC (rev 22471)
@@ -35,7 +35,7 @@
 # These variables (gnomehelpdir and otherdocdir) specify where the documents
 # should be installed. The default values should work for most packages.
 # Gnome Help expects all documents here (this is where the xml files should go):
-gnomehelpdir = $(datadir)/gnome/help/$(docname)/$(lang)
+gnomehelpdir = $(datadir)/gnome/help/gnucash/$(lang)
 # Our other document versions go here:
 otherdocdir = $(docdir)/$(lang)