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

diff --git a/Makefile b/Makefile
index b138e05..87ce913 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,15 @@ all:
 install: install-python install-phpxmlrpc
 
 install-python:
-	pip install --target $(DESTDIR)/$(datadir)/plc_api .
+	# we mention --upgrade because otherwise
+	# pip install complains the php/ target already exists
+	# and it refuses to put plc_api.php in there
+	pip install --upgrade --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
+	mv $(DESTDIR)/$(datadir)/plc_api/bin/Server.py $(DESTDIR)/$(datadir)/Server.py
+	# the old recipe used to read
 	# python3 setup.py install \
 	#     --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
 	#     --install-scripts=$(DESTDIR)/$(datadir)/plc_api \