From 63339e48c1f8e731af6f4f48afc896b523027f2c Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 9 Jan 2015 10:49:52 +0100 Subject: [PATCH] fixed localstatedir in sphinx.conf --- Makefile.in | 2 +- etc/Makefile.in | 5 +++-- etc/sphinx.conf.in | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8f54a409..850b960e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,7 +66,7 @@ $(RECURSIVE_TARGETS): installdirs: mkinstalldirs $(srcdir)/mkinstalldirs \ - $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir)/piler $(DESTDIR)$(datarootdir)/piler $(DESTDIR)$(sysconfdir) \ + $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir)/piler $(DESTDIR)$(datarootdir)/piler $(DESTDIR)$(sysconfdir) $(DESTDIR)/etc/init.d \ $(DESTDIR)$(localstatedir)/piler/store \ $(DESTDIR)$(localstatedir)/piler/stat $(DESTDIR)$(localstatedir)/piler/tmp \ $(DESTDIR)$(localstatedir)/piler/sphinx diff --git a/etc/Makefile.in b/etc/Makefile.in index 1a7ec6c9..356e968a 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -32,10 +32,11 @@ all: install: if [ ! -f "$(DESTDIR)$(sysconfdir)/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler.conf; fi - $(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/sphinx.conf.in $(DESTDIR)$(sysconfdir)/sphinx.conf.dist + sed -e 's%LOCALSTATEDIR%$(localstatedir)%g' $(srcdir)/sphinx.conf.in > sphinx.conf.dist + $(INSTALL) -m 0644 -g $(RUNNING_GROUP) $(srcdir)/sphinx.conf.dist $(DESTDIR)$(sysconfdir)/sphinx.conf.dist clean: - rm -f piler.conf cron.jobs + rm -f piler.conf cron.jobs sphinx.conf.dist distclean: clean rm -f Makefile diff --git a/etc/sphinx.conf.in b/etc/sphinx.conf.in index 445821fd..e9deafe2 100644 --- a/etc/sphinx.conf.in +++ b/etc/sphinx.conf.in @@ -81,7 +81,7 @@ source note : base index main1 { source = main1 - path = /var/piler/sphinx/main1 + path = LOCALSTATEDIR/piler/sphinx/main1 docinfo = extern dict = keywords min_prefix_len = 6 @@ -93,7 +93,7 @@ index main1 index main2 { source = main2 - path = /var/piler/sphinx/main2 + path = LOCALSTATEDIR/piler/sphinx/main2 docinfo = extern dict = keywords min_prefix_len = 6 @@ -105,7 +105,7 @@ index main2 index main3 { source = main3 - path = /var/piler/sphinx/main3 + path = LOCALSTATEDIR/piler/sphinx/main3 docinfo = extern dict = keywords min_prefix_len = 6 @@ -117,7 +117,7 @@ index main3 index main4 { source = main4 - path = /var/piler/sphinx/main4 + path = LOCALSTATEDIR/piler/sphinx/main4 docinfo = extern dict = keywords min_prefix_len = 6 @@ -129,7 +129,7 @@ index main4 index dailydelta1 { source = dailydelta - path = /var/piler/sphinx/dailydelta1 + path = LOCALSTATEDIR/piler/sphinx/dailydelta1 docinfo = extern dict = keywords min_prefix_len = 6 @@ -141,7 +141,7 @@ index dailydelta1 index delta1 { source = delta - path = /var/piler/sphinx/delta1 + path = LOCALSTATEDIR/piler/sphinx/delta1 docinfo = extern dict = keywords min_prefix_len = 6 @@ -154,7 +154,7 @@ index delta1 index tag1 { source = tag - path = /var/piler/sphinx/tag1 + path = LOCALSTATEDIR/piler/sphinx/tag1 docinfo = extern dict = keywords min_prefix_len = 6 @@ -167,7 +167,7 @@ index tag1 index note1 { source = note - path = /var/piler/sphinx/note1 + path = LOCALSTATEDIR/piler/sphinx/note1 docinfo = extern dict = keywords min_prefix_len = 6