r21467 - gnucash-docs/trunk - Bug #661705 : Fix omf folders path in order to be picked up by yelp. Patch provided by Sébastien Villemot.

[Cristian Marchi]

Author: cmarchi
Date: 2011-10-20 04:24:32 -0400 (Thu, 20 Oct 2011)
New Revision: 21467
Trac: http://svn.gnucash.org/trac/changeset/21467

Modified:
   gnucash-docs/trunk/omf.make
Log:
Bug #661705 : Fix omf folders path in order to be picked up by yelp. Patch provided by Sébastien Villemot.

Modified: gnucash-docs/trunk/omf.make
===================================================================
--- gnucash-docs/trunk/omf.make	2011-10-20 08:17:06 UTC (rev 21466)
+++ gnucash-docs/trunk/omf.make	2011-10-20 08:24:32 UTC (rev 21467)
@@ -26,7 +26,7 @@
 # 	Version: 0.1.2 (last updated: March 20, 2002)
 #
 
-omf_dest_dir=$(datadir)/omf/gnucash-docs
+omf_dest_dir=$(datadir)/omf
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
 
 omf: omf_timestamp
@@ -40,17 +40,21 @@
 install-data-hook-omf:
 	$(mkinstalldirs) "$(DESTDIR)$(omf_dest_dir)"
 	for file in $(omffile); do \
-	$(INSTALL_DATA) "$$file.out" "$(DESTDIR)$(omf_dest_dir)/$$file"; \
-	done
-	@if test "x$(_ENABLE_SK)" = "xtrue"; then \
-	scrollkeeper-update -p "$(scrollkeeper_localstate_dir)" -o "$(DESTDIR)$(omf_dest_dir)"; \
-	fi;
+  omfdir="$(DESTDIR)$(omf_dest_dir)/`echo $$file | sed 's/-[^-]*\.omf$$//'`"; \
+	$(mkinstalldirs) "$$omfdir"; \
+	$(INSTALL_DATA) "$$file.out" "$$omfdir/$$file"; \
+	if test "x$(_ENABLE_SK)" = "xtrue"; then \
+	scrollkeeper-update -p "$(scrollkeeper_localstate_dir)" -o "$$omfdir"; \
+	fi; \
+  done;
 
 uninstall-local-omf:
-	@if test "x$(_ENABLE_SK)" == "xtrue"; then \
-	scrollkeeper-uninstall -p "$(scrollkeeper_localstate_dir)" "$(DESTDIR)$(omf_dest_dir)/$$file"; \
+	for file in $(omffile); do \
+  omfdir="$(DESTDIR)$(omf_dest_dir)/`echo $$file | sed 's/-[^-]*\.omf$$//'`"; \
+	if test "x$(_ENABLE_SK)" == "xtrue"; then \
+	scrollkeeper-uninstall -p "$(scrollkeeper_localstate_dir)" "$$omfdir/$$file"; \
 	fi; \
-	for file in $(srcdir)/*.omf; do \
-	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	  rm -f "$(DESTDIR)$(omf_dest_dir)/$$basefile"; \
-	done
+	rm -f "$$omfdir/$$file; \
+  rmdir "$$omfdir"; \
+  done;
+