git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8bab64f
)
fix packaging for f37 (4/n)
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Fri, 25 Nov 2022 17:17:00 +0000
(18:17 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Fri, 25 Nov 2022 17:24:59 +0000
(18:24 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
35bdac9
..
7eb4969
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,9
+21,11
@@
PWD := $(shell pwd)
all:
python3 setup.py build
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
# 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
# --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/
mkdir -p $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/
rsync --exclude .git -ai php/phpxmlrpc/ $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/