[cyphesis] And two more places to fix for unversioned docdir.

Tomáš Mráz tmraz at fedoraproject.org
Tue Apr 22 20:22:04 UTC 2014


commit 1d7d22535b2a27d05f948cd5a930cf48de795968
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Apr 22 22:21:43 2014 +0200

    And two more places to fix for unversioned docdir.

 cyphesis-0.6.0-unversioned-docdir.patch |   48 +++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/cyphesis-0.6.0-unversioned-docdir.patch b/cyphesis-0.6.0-unversioned-docdir.patch
index 6f49dec..72af1e1 100644
--- a/cyphesis-0.6.0-unversioned-docdir.patch
+++ b/cyphesis-0.6.0-unversioned-docdir.patch
@@ -22,6 +22,54 @@ diff -up cyphesis-0.6.0/data/Makefile.in.docdir cyphesis-0.6.0/data/Makefile.in
  confbackup_DATA = cyphesis.vconf $(MASON_RULES) acorn.xml werewolf.xml
  all: all-recursive
  
+diff -up cyphesis-0.6.0/data/mars/Makefile.am.docdir cyphesis-0.6.0/data/mars/Makefile.am
+--- cyphesis-0.6.0/data/mars/Makefile.am.docdir	2012-10-09 10:42:37.000000000 +0200
++++ cyphesis-0.6.0/data/mars/Makefile.am	2014-04-22 22:19:50.490387022 +0200
+@@ -5,7 +5,7 @@ confdir = $(sysconfdir)/cyphesis
+ rulesetdir = $(sysconfdir)/cyphesis/mars.d
+ dist_ruleset_DATA = $(MARS_RULES)
+ 
+-confbackupdir = $(datadir)/doc/cyphesis-$(VERSION)/conf
++confbackupdir = $(docdir)/conf
+ confbackup_DATA = $(MARS_RULES)
+ 
+ check-local:
+diff -up cyphesis-0.6.0/data/mars/Makefile.in.docdir cyphesis-0.6.0/data/mars/Makefile.in
+--- cyphesis-0.6.0/data/mars/Makefile.in.docdir	2012-11-09 22:39:17.000000000 +0100
++++ cyphesis-0.6.0/data/mars/Makefile.in	2014-04-22 22:20:13.483504269 +0200
+@@ -230,7 +230,7 @@ MARS_RULES = basic.xml characters.xml en
+ confdir = $(sysconfdir)/cyphesis
+ rulesetdir = $(sysconfdir)/cyphesis/mars.d
+ dist_ruleset_DATA = $(MARS_RULES)
+-confbackupdir = $(datadir)/doc/cyphesis-$(VERSION)/conf
++confbackupdir = $(docdir)/conf
+ confbackup_DATA = $(MARS_RULES)
+ all: all-am
+ 
+diff -up cyphesis-0.6.0/data/minimal/Makefile.am.docdir cyphesis-0.6.0/data/minimal/Makefile.am
+--- cyphesis-0.6.0/data/minimal/Makefile.am.docdir	2012-10-09 10:42:37.000000000 +0200
++++ cyphesis-0.6.0/data/minimal/Makefile.am	2014-04-22 22:18:39.172021412 +0200
+@@ -5,7 +5,7 @@ confdir = $(sysconfdir)/cyphesis
+ rulesetdir = $(sysconfdir)/cyphesis/minimal.d
+ dist_ruleset_DATA = $(MINIMAL_RULES)
+ 
+-confbackupdir = $(datadir)/doc/cyphesis-$(VERSION)/conf
++confbackupdir = $(docdir)/conf
+ confbackup_DATA = $(MINIMAL_RULES)
+ 
+ check-local:
+diff -up cyphesis-0.6.0/data/minimal/Makefile.in.docdir cyphesis-0.6.0/data/minimal/Makefile.in
+--- cyphesis-0.6.0/data/minimal/Makefile.in.docdir	2012-11-09 22:39:17.000000000 +0100
++++ cyphesis-0.6.0/data/minimal/Makefile.in	2014-04-22 22:19:25.830260940 +0200
+@@ -230,7 +230,7 @@ MINIMAL_RULES = basic.xml characters.xml
+ confdir = $(sysconfdir)/cyphesis
+ rulesetdir = $(sysconfdir)/cyphesis/minimal.d
+ dist_ruleset_DATA = $(MINIMAL_RULES)
+-confbackupdir = $(datadir)/doc/cyphesis-$(VERSION)/conf
++confbackupdir = $(docdir)/conf
+ confbackup_DATA = $(MINIMAL_RULES)
+ all: all-am
+ 
 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


More information about the scm-commits mailing list