[icinga-checkins] icinga.org: icinga-reports/master: install icinga-reporting.jar

git at icinga.org git at icinga.org
Tue Jul 19 13:55:57 CEST 2016


Module: icinga-reports
Branch: master
Commit: 7427c4b46e8c73c74e8bbc315a6fb8ec7bdc6685
URL:    https://git.icinga.org/?p=icinga-reports.git;a=commit;h=7427c4b46e8c73c74e8bbc315a6fb8ec7bdc6685

Author: Christoph Niemann <christoph.niemann at netways.de>
Date:   Fri Apr 15 16:27:01 2016 +0200

install icinga-reporting.jar

---

 Makefile.in |   21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a355c0b..b1d97a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,8 +135,9 @@ install-jar-files:
 	@if [ x$(JASPER_SERVER) != xno ]; then \
                 echo "" ;\
                 echo "*** Installing icinga-reporting.jar to your jasper server into '$(JASPER_SERVER)/apache-tomcat/webapps/jasperserver/WEB-INF/lib/' ***" ;\
+		if [ ! -f java/icinga-reporting.jar ]; then make -C java/ ; fi;\
 		$(INSTALL) -d $(INSTALL_OPTS) $(JASPER_SERVER)/apache-tomcat/webapps/jasperserver/WEB-INF/lib ;\
-		$(INSTALL) -b -m 755 $(INSTALL_OPTS) jsp-server/classes/icinga/icinga-reporting.jar $(JASPER_SERVER)/apache-tomcat/webapps/jasperserver/WEB-INF/lib ;\
+		$(INSTALL) -b -m 755 $(INSTALL_OPTS) java/icinga-reporting.jar $(JASPER_SERVER)/apache-tomcat/webapps/jasperserver/WEB-INF/lib ;\
 	fi      
 
 	@if [ x$(JASPER_SERVER) = xno ]; then \
@@ -149,24 +150,6 @@ install-jar-files:
 	fi
 
 
-install-mysql-connector:
-	@if [ x$(JASPER_SERVER) != xno ]; then \
-                echo "" ;\
-                echo "*** Installing JDBC driver for MySQL $(MYSQL_CONNECTOR_VERSION) to your jasper server into '$(JASPER_SERVER)/apache-tomcat/lib/' ***" ;\
-		$(INSTALL) -d $(INSTALL_OPTS) $(JASPER_SERVER)/apache-tomcat/lib ;\
-		$(INSTALL) -b -m 755 $(INSTALL_OPTS) jsp-server/classes/connector/mysql-connector-java-$(MYSQL_CONNECTOR_VERSION)/mysql-connector-java-$(MYSQL_CONNECTOR_VERSION)-bin.jar $(JASPER_SERVER)/apache-tomcat/lib ;\
-	fi
-
-	@if [ x$(JASPER_SERVER) = xno ]; then \
-		echo "" ;\
-		echo "Sorry, but no supported JasperServer installation found!" ;\
-		echo "" ;\
-	else \
-		echo "*** JDBC driver for MySQL successfully installed ***" ;\
-		echo "" ;\
-	fi
-
-
 ###############################
 # JasperServer
 ###############################



More information about the icinga-checkins mailing list