fixed localstatedir in sphinx.conf

This commit is contained in:
SJ 2015-01-09 10:49:52 +01:00
parent 12649bee12
commit 63339e48c1
3 changed files with 12 additions and 11 deletions

View File

@ -66,7 +66,7 @@ $(RECURSIVE_TARGETS):
installdirs: mkinstalldirs installdirs: mkinstalldirs
$(srcdir)/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/store \
$(DESTDIR)$(localstatedir)/piler/stat $(DESTDIR)$(localstatedir)/piler/tmp \ $(DESTDIR)$(localstatedir)/piler/stat $(DESTDIR)$(localstatedir)/piler/tmp \
$(DESTDIR)$(localstatedir)/piler/sphinx $(DESTDIR)$(localstatedir)/piler/sphinx

View File

@ -32,10 +32,11 @@ all:
install: install:
if [ ! -f "$(DESTDIR)$(sysconfdir)/piler.conf" ]; then $(INSTALL) -m 0640 -g $(RUNNING_GROUP) $(srcdir)/piler.conf $(DESTDIR)$(sysconfdir)/piler.conf; fi 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: clean:
rm -f piler.conf cron.jobs rm -f piler.conf cron.jobs sphinx.conf.dist
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile

View File

@ -81,7 +81,7 @@ source note : base
index main1 index main1
{ {
source = main1 source = main1
path = /var/piler/sphinx/main1 path = LOCALSTATEDIR/piler/sphinx/main1
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -93,7 +93,7 @@ index main1
index main2 index main2
{ {
source = main2 source = main2
path = /var/piler/sphinx/main2 path = LOCALSTATEDIR/piler/sphinx/main2
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -105,7 +105,7 @@ index main2
index main3 index main3
{ {
source = main3 source = main3
path = /var/piler/sphinx/main3 path = LOCALSTATEDIR/piler/sphinx/main3
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -117,7 +117,7 @@ index main3
index main4 index main4
{ {
source = main4 source = main4
path = /var/piler/sphinx/main4 path = LOCALSTATEDIR/piler/sphinx/main4
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -129,7 +129,7 @@ index main4
index dailydelta1 index dailydelta1
{ {
source = dailydelta source = dailydelta
path = /var/piler/sphinx/dailydelta1 path = LOCALSTATEDIR/piler/sphinx/dailydelta1
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -141,7 +141,7 @@ index dailydelta1
index delta1 index delta1
{ {
source = delta source = delta
path = /var/piler/sphinx/delta1 path = LOCALSTATEDIR/piler/sphinx/delta1
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -154,7 +154,7 @@ index delta1
index tag1 index tag1
{ {
source = tag source = tag
path = /var/piler/sphinx/tag1 path = LOCALSTATEDIR/piler/sphinx/tag1
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6
@ -167,7 +167,7 @@ index tag1
index note1 index note1
{ {
source = note source = note
path = /var/piler/sphinx/note1 path = LOCALSTATEDIR/piler/sphinx/note1
docinfo = extern docinfo = extern
dict = keywords dict = keywords
min_prefix_len = 6 min_prefix_len = 6