From d20644a48d03667bb25dc583517de06e94606c64 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 25 Nov 2022 18:17:00 +0100 Subject: [PATCH] fix packaging for f37 (4/n) --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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/ -- 2.43.0