X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/cb7b4fadaaa220075603c9c63860e22ff7ebcac1..fe555c380f0388cf711e219f84dd8b49fefb2cbb:/build.mk

diff --git a/build.mk b/build.mk
index d415459..7f0d890 100644
--- a/build.mk
+++ b/build.mk
@@ -92,11 +92,12 @@ $(deb): Cycript.lib/cycript-apl Cycript.lib/libcycript.dylib Cycript.lib/libcycr
 	mkdir -p package/DEBIAN
 	sed -e 's/#/$(version)/' control.in >package/DEBIAN/control
 	mkdir -p package/usr/{bin,lib}
-	cp -a modules package/usr/lib/cycript0.9
+	cp -a cycript0.9 package/usr/lib/cycript0.9
 	$(lipo) -extract armv6 -output package/usr/bin/cycript Cycript.lib/cycript-apl
 	$(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript.lib/libcycript.dylib
 	ln -s libcycript.dylib package/usr/lib/libcycript.0.dylib
 	cp -a libcycript.cy package/usr/lib/libcycript.cy
+	cp -a Cycript.lib/libcycript.jar package/usr/lib/libcycript.jar
 	cp -a Cycript.lib/libcycript.db package/usr/lib/libcycript.db
 	sqlite3 package/usr/lib/libcycript.db "delete from cache where system & $$(($$(cat build.ios-arm{v6,64}/Makefile | sed -e '/^CY_SYSTEM = \([0-9]*\)$$/{s//\1/;p;};d;' | tr $$'\n' '|') 0)) == 0; vacuum full;"
 	./dpkg-deb.sh -Zlzma -b package $@
@@ -277,8 +278,7 @@ Cycript.lib/libcycript.cy:
 
 Cycript.lib/libcycript.db: $(db)
 	@mkdir -p $(dir $@)
-	./libcycript.sh 0 $@
-	./libcycript.py $@ $^
+	./libcycript.py 0 $@ $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) $^ </dev/null
 
 Cycript.lib/libcycript.jar: build.osx-x86_64/libcycript.jar
 	@mkdir -p $(dir $@)
@@ -286,7 +286,7 @@ Cycript.lib/libcycript.jar: build.osx-x86_64/libcycript.jar
 
 Cycript.lib/cycript0.9:
 	@mkdir -p $(dir $@)
-	ln -s ../modules $@
+	ln -sf ../cycript0.9 $@
 
 cycript: cycript.in
 	cp -af $< $@