X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=7eb496935c2a1aec1e31575aeff1264bf11ea90d;hb=4facb0674ab3f9e2deac6e92717b71cbd05f3c10;hp=35bdac96db0f177f06f3ded243fba415838ae9be;hpb=8bab64f21e2053a2b8332c28f0fba08ce4b9a10d;p=plcapi.git

diff --git a/Makefile b/Makefile
index 35bdac9..7eb4969 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,11 @@ PWD := $(shell pwd)
 all:
 	python3 setup.py build
 
-install: install-python install-phpxmlrpc
-
-install-python:
+# 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
@@ -37,10 +39,8 @@ install-python:
 	#     --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/