X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zebra%2FMakefile;h=35a4a2584a0664af03d2524be57e7ae76678152c;hb=45c7ffc5aa4562b03a9add900b463d6eca2bae12;hp=dab1639d70aaeea20dfa910f9ac63cf813646b42;hpb=b0dd2ce4dfba7059803abd946e264a04e9d72c24;p=irspy-moved-to-github.git

diff --git a/zebra/Makefile b/zebra/Makefile
index dab1639..35a4a25 100644
--- a/zebra/Makefile
+++ b/zebra/Makefile
@@ -53,19 +53,31 @@ dump:
 clean:
 	rm -f terse.properties
 
-start-zebra:
-	zebrasrv-2.0 -f yazserver.xml > ${ZEBRA_LOGFILE} 2>&1 &
+check-running-zebrasrv:
+	@if zoomsh  -e "open localhost:8018"  "quit" >/dev/null; then \
+	   echo ""; \
+	   echo "There is already a running zebrasrv on localhost:8018"; \
+	   echo "You may need to run: killall zebrasrv-2.0"; \
+	   false; \
+	else \
+	   true; \
+	fi
+
+start-zebra: check-running-zebrasrv
+	zebrasrv-2.0 -f $$(pwd)/yazserver.xml > ${ZEBRA_LOGFILE} 2>&1 &
 
 stop-zebra:
 	kill `cat ${ZEBRA_PID_FILE}`
 	sleep 0.5
 	-kill -9 `cat ${ZEBRA_PID_FILE}`
 
+check: newdb start-zebra dump stop-zebra distclean
+	
 distclean: clean
 	rm -rf ${IRSPY_ARCHIVE} ${ZEBRA_DIR} ${ZEBRA_DIR} ${ZEBRA_TEST_DIR} ${ZEBRA_LOGFILE}
 
 help:
-	@echo "make [ dump | test | newdb | newdb-test ]"
+	@echo "make [ newdb | newdb-test | dump | check ]"
 	@echo "     [ start-zebra | stop-zebra ]"
 	@echo "     [ clean | distclean ]"