Fix: add catalina home

[lui-solr.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 029f76e..0ed5254 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
 
 LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
-
+CATALINA_HOME=/usr/share/tomcat6
 SOLR_VERSION=4.3.1
 
 PACKAGE=$(shell dh_listpackages)
@@ -86,11 +86,11 @@ install-stamp: build
 
        # lui-solr-master plumbing for Tomcat 6. 
        mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui
-       cp etc/solr-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr-master.xml
+       cp etc/solr4-tomcat-context-master.xml $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui/lui-solr4-master.xml
 
        # lui-solr-slave plumbing for Tomcat 6
        mkdir -p $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui
-       cp etc/solr-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr-slave.xml
+       cp etc/solr4-tomcat-context-slave.xml $(LUI_SOLR_SLAVE_ROOT)/etc/masterkey/lui/lui-solr4-slave.xml
 
        touch $@