From 43daac1782d7009c26b93327da5d153420a295de Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Apr 22 2014 20:01:50 +0000 Subject: One more place to fix for unversioned docdir. --- diff --git a/cyphesis-0.6.0-unversioned-docdir.patch b/cyphesis-0.6.0-unversioned-docdir.patch index 1f81e68..6f49dec 100644 --- a/cyphesis-0.6.0-unversioned-docdir.patch +++ b/cyphesis-0.6.0-unversioned-docdir.patch @@ -1,3 +1,27 @@ +diff -up cyphesis-0.6.0/data/Makefile.am.docdir cyphesis-0.6.0/data/Makefile.am +--- cyphesis-0.6.0/data/Makefile.am.docdir 2012-10-09 10:42:37.000000000 +0200 ++++ cyphesis-0.6.0/data/Makefile.am 2014-04-22 22:01:15.136055463 +0200 +@@ -12,7 +12,7 @@ dist_conf_DATA = cyphesis.vconf + rulesetdir = $(sysconfdir)/cyphesis/mason.d + dist_ruleset_DATA = $(MASON_RULES) + +-confbackupdir = $(datadir)/doc/cyphesis-$(VERSION)/conf ++confbackupdir = $(docdir)/conf + confbackup_DATA = cyphesis.vconf $(MASON_RULES) acorn.xml werewolf.xml + + check-local: +diff -up cyphesis-0.6.0/data/Makefile.in.docdir cyphesis-0.6.0/data/Makefile.in +--- cyphesis-0.6.0/data/Makefile.in.docdir 2012-11-09 22:39:17.000000000 +0100 ++++ cyphesis-0.6.0/data/Makefile.in 2014-04-22 22:01:32.980137081 +0200 +@@ -276,7 +276,7 @@ confdir = $(sysconfdir)/cyphesis + dist_conf_DATA = cyphesis.vconf + rulesetdir = $(sysconfdir)/cyphesis/mason.d + dist_ruleset_DATA = $(MASON_RULES) +-confbackupdir = $(datadir)/doc/cyphesis-$(VERSION)/conf ++confbackupdir = $(docdir)/conf + confbackup_DATA = cyphesis.vconf $(MASON_RULES) acorn.xml werewolf.xml + all: all-recursive + diff -up cyphesis-0.6.0/Makefile.am.docdir cyphesis-0.6.0/Makefile.am --- cyphesis-0.6.0/Makefile.am.docdir 2014-04-22 21:13:30.000000000 +0200 +++ cyphesis-0.6.0/Makefile.am 2014-04-22 21:40:00.060342036 +0200