X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;fp=Makefile;h=b138e0539a7a5e8ed711d8ee645167737cf1f0d9;hb=13cdde8c6f6ea0dac1ea30d703d70938ba8dfcb1;hp=0c546e361912df0a76f2d023b4cdbc99194e3a63;hpb=afaa86e866019b80eb3524706fc19837047c2e49;p=plcapi.git

diff --git a/Makefile b/Makefile
index 0c546e3..b138e05 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,14 @@ all:
 install: install-python install-phpxmlrpc
 
 install-python:
-	python3 setup.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
-	    --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
-	    --install-data=$(DESTDIR)/$(datadir)/plc_api
+	pip install --target $(DESTDIR)/$(datadir)/plc_api .
+	# it's important that plcsh sits in /usr/share/plc_api
+	# and not under bin/ so that python can find the PLC/ modules
+	mv $(DESTDIR)/$(datadir)/plc_api/bin/plcsh $(DESTDIR)/$(datadir)/plc_api
+	# python3 setup.py install \
+	#     --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
+	#     --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
+	#     --install-data=$(DESTDIR)/$(datadir)/plc_api
 
 # phpxmlrpc is a git subtree; we just ship all its contents
 # under /usr/share/plc_api/php/phpxmlrpc