projects
/
lui-solr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Align with master
[lui-solr.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index
86f0ca1
..
192226b
100755
(executable)
--- 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 = $(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)
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)
# lui-solr-common. Install a Solr WAR.
mkdir -p $(LUI_SOLR_COMMON_DIR)
- cp dist/apache-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
cp -rp scripts $(LUI_SOLR_COMMON_DIR)
# lui-solr-master