X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=7eb496935c2a1aec1e31575aeff1264bf11ea90d;hb=2fb2ab94189643bedabcef1b585671da5a01832e;hp=b138e0539a7a5e8ed711d8ee645167737cf1f0d9;hpb=13cdde8c6f6ea0dac1ea30d703d70938ba8dfcb1;p=plcapi.git

diff --git a/Makefile b/Makefile
index b138e05..7eb4969 100644
--- a/Makefile
+++ b/Makefile
@@ -21,21 +21,26 @@ PWD := $(shell pwd)
 all:
 	python3 setup.py build
 
-install: install-python install-phpxmlrpc
-
-install-python:
-	pip install --target $(DESTDIR)/$(datadir)/plc_api .
+# do the install sequentially
+# when defining 2 separate targets, that get run in parallel
+# we observe that the rsync for xmlrpc somehow gets erased and
+# we suspect pip install to do some cleanup at the end...
+install:
+	# 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)/plc_api
+	# the old recipe used to read
 	# 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
-install-phpxmlrpc:
+	# phpxmlrpc is a git subtree; we just ship all its contents
+	# under /usr/share/plc_api/php/phpxmlrpc
 	mkdir -p $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/
 	rsync --exclude .git -ai php/phpxmlrpc/ $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/