Fix COMMON_TOMCAT setting to match package. Rewrite copy of libraries

diff --git a/debian/rules b/debian/rules
index 0ed5254..9202582 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,10 +28,10 @@ LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
 LUI_SOLR_MASTER_SHARE_DIR = $(LUI_SOLR_MASTER_ROOT)$(CONF_MASTER)
 LUI_SOLR_MASTER_LIB_DIR = $(LUI_SOLR_MASTER_ROOT)$(DATA_MASTER)
 
-LUI_SOLR_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-tomcat
+LUI_SOLR_COMMON_TOMCAT = $(LUI_SOLR_COMMON)-tomcat6
 LUI_SOLR_COMMON_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON_TOMCAT)
 
-LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat
+LUI_SOLR_MASTER_TOMCAT = $(LUI_SOLR_MASTER)-tomcat6
 LUI_SOLR_MASTER_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER_TOMCAT)
 
 LUI_SOLR_SLAVE = $(BASE)-slave
@@ -39,7 +39,7 @@ LUI_SOLR_SLAVE_ROOT = $(CURDIR)/debian/$(LUI_SOLR_SLAVE)
 LUI_SOLR_SLAVE_SHARE_DIR = $(LUI_SOLR_SLAVE_ROOT)$(CONF_SLAVE)
 LUI_SOLR_SLAVE_LIB_DIR = $(LUI_SOLR_SLAVE_ROOT)$(DATA_SLAVE)
 
-LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat
+LUI_SOLR_SLAVE_TOMCAT = $(LUI_SOLR_SLAVE)-tomcat6
 LUI_SOLR_SLAVE_TOMCAT_ROOT = $(CURDIR)/debian/$(LUI_SLAVE_TOMCAT)
 CATALINA_HOME=/usr/share/tomcat6
 SOLR_VERSION=4.3.1
@@ -82,7 +82,8 @@ install-stamp: build
        # Common lui-solr4-tomcat: Logging Libraries installed under tomcat6. 
        # Harvester Utilities. Stylesheet used in includes needs to be in CATALINA_HOME
        mkdir -p $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
-       cp -r lib/ $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib
+       cp -rp lib/ $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)
+       ls -la $(LUI_SOLR_COMMON_TOMCAT_ROOT)$(CATALINA_HOME)/lib/
 
        # lui-solr-master plumbing for Tomcat 6. 
        mkdir -p $(LUI_SOLR_MASTER_ROOT)/etc/masterkey/lui