[Opensrf-commits] r1080 - trunk/src/java

[svn at svn.open-ils.org]

Author: erickson
Date: 2007-08-17 17:57:31 -0400 (Fri, 17 Aug 2007)
New Revision: 1080

Modified:
   trunk/src/java/Makefile
Log:
updated to work with opensrf.jar with doing 'make run'



Modified: trunk/src/java/Makefile
===================================================================
--- trunk/src/java/Makefile	2007-08-17 21:57:16 UTC (rev 1079)
+++ trunk/src/java/Makefile	2007-08-17 21:57:31 UTC (rev 1080)
@@ -35,7 +35,8 @@
 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 @@
 	@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