Various Python 3 support changes

1 files changed, 22 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 852569a0..e1576dcf 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,8 @@ json.o: ./json/jsoncpp.cpp ./json/json.h ./json/json-forwards.h
 install: generate $(TARGET).a
 	@echo "Installing binaryninja API.";
 	cp -r python/* $(INSTALLPATH)/python/binaryninja
-	cp $(TARGETDIR)/$(TARGET).a $(INSTALLPATH)
+	cp $(TARGET).a $(INSTALLPATH)
+	@echo "Done.";
 
 generator: python/generator.cpp $(TARGET).a
 	@echo "Building generator...";
@@ -65,43 +66,36 @@ python_test: environment python/_binaryninjacore.py python/enums.py
 oracle: environment python/_binaryninjacore.py python/enums.py
 	python3 suite/generator.py
 
-environment: python/_binaryninjacore.py python/enums.py 
-	@echo "Copying libs to needed locations..."
-	@cp $(INSTALLPATH)/libbinaryninjacore.so.1 .
-	@cp $(INSTALLPATH)/libcurl.so.4 .
-	@cp $(INSTALLPATH)/libcrypto.so.1.0.2 .
-	@cp $(INSTALLPATH)/libssl.so.1.0.2 .
-
-	@mkdir -p api/python/examples
-	@cp python/examples/bin_info.py api/python/examples/
-	@cp $(INSTALLPATH)/libbinaryninjacore.so.1 api/python/
-	@cp $(INSTALLPATH)/libcurl.so.4 api/python/
-	@cp $(INSTALLPATH)/libcrypto.so.1.0.2 api/python/
-	@cp $(INSTALLPATH)/libssl.so.1.0.2 api/python/
+environment: environment_clean python/_binaryninjacore.py python/enums.py 
+	@echo "Copying over libs..."
+	cp $(INSTALLPATH)/libbinaryninjacore.so.1 .
+	cp $(INSTALLPATH)/libbinaryninjacore.so.1 python/
 
 	@echo "Building 'binaryninja' Packages..."
-	@mkdir -p suite/binaryninja/
-	@cp -r python/* suite/binaryninja/
-	@mkdir -p api/python/examples/binaryninja/
-	@cp -r python/* api/python/examples/binaryninja/
+	mkdir -p suite/binaryninja/
+	cp -r python/* suite/binaryninja/
+	cp -r suite/binaryninja/ python/examples/
 
 	@echo "Copying Architectures Over..."
-	@cp -r $(INSTALLPATH)/types/ .
-	@cp -r $(INSTALLPATH)/plugins/ .
-	@cp -r $(INSTALLPATH)/plugins/ api/python/
+	cp -r $(INSTALLPATH)/types/ .
+	cp -r $(INSTALLPATH)/plugins/ .
+	cp -r $(INSTALLPATH)/types/ python/
+	cp -r $(INSTALLPATH)/plugins/ python/
 
 environment_clean:
 	@echo "Removing 'binaryninja' Packages..."
-	@rm -r suite/binaryninja/
-	@rm -r api/
-	-@rm suite/*.pyc
-
+	rm -rf suite/binaryninja/
+	rm -rf python/examples/binaryninja/
+	
 	@echo "Removing libs..."
-	@rm lib*
+	rm -f libbinaryninjacore.so.1
+	rm -f python/libbinaryninjacore.so.1
 
 	@echo "Removing Architectures..."
-	@rm -r types/
-	@rm -r plugins/
+	rm -rf types/
+	rm -rf plugins/
+	rm -rf python/types/
+	rm -rf python/plugins/
 
 clean: 
 	@echo " Cleaning...";