From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 4 Sep 2013 13:33:18 +0000 (+0200)
Subject: Fix common location. Hopefully get scripts installed
X-Git-Tag: v0.5.1~3
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=ee82e1e77223b0108262acdde59f3c4ecae55392;p=lui-solr.git

Fix common location. Hopefully get scripts installed
---

diff --git a/debian/rules b/debian/rules
index 4c7d85d..192226b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DATA_SLAVE  = $(DATA)/slave
 
 LUI_SOLR_COMMON = $(BASE)-common
 LUI_SOLR_COMMON_ROOT = $(CURDIR)/debian/$(LUI_SOLR_COMMON)
-LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)/war
+LUI_SOLR_COMMON_DIR = $(LUI_SOLR_COMMON_ROOT)$(SHARE)
 
 LUI_SOLR_MASTER = $(BASE)-master
 LUI_SOLR_MASTER_ROOT = $(CURDIR)/debian/$(LUI_SOLR_MASTER)
@@ -63,7 +63,8 @@ install-stamp: build
 
 	# lui-solr-common. Install a Solr WAR.
 	mkdir -p $(LUI_SOLR_COMMON_DIR)
-	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)
+	mkdir -p $(LUI_SOLR_COMMON_DIR)/war
+	cp dist/solr-$(SOLR_VERSION).war $(LUI_SOLR_COMMON_DIR)/war/
 	cp -rp scripts $(LUI_SOLR_COMMON_DIR)
 
 	# lui-solr-master