From: erickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Fri, 17 Aug 2007 21:57:31 +0000 (+0000)
Subject: updated to work with opensrf.jar with doing 'make run'
X-Git-Tag: osrf_rel_2_0_1~886
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a950d98543d87766d43bd90facd9f44ca90adb9a;p=OpenSRF.git

updated to work with opensrf.jar with doing 'make run'



git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1080 9efc2488-bf62-4759-914b-345cdb29e865
---

diff --git a/src/java/Makefile b/src/java/Makefile
index eeaa928..a04845c 100644
--- a/src/java/Makefile
+++ b/src/java/Makefile
@@ -35,7 +35,8 @@ opensrf:	deps
 jar:	opensrf
 	rm -f opensrf.jar
 	echo "creating opensrf.jar"
-	jar cf opensrf.jar -C .lib org/opensrf/
+	jar cf opensrf.jar -C .lib org
+	rm -r $(JAVA_LIBDIR)
 
 # only prints the first 30 lines of errors
 slim:
@@ -49,7 +50,7 @@ check:
 	@echo -e "\nTruncating at 30 lines"
 
 run:
-	$(JAVA) -cp $(JAVA_LIBS) $(JAVA_EXE) $(JAVA_ARGS)
+	$(JAVA) -cp $(JAVA_LIBS):opensrf.jar $(JAVA_EXE) $(JAVA_ARGS)
 
 deps:
 	mkdir -p ext