git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix packaging for f37 (2/n)
[plcapi.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b138e05
..
87ce913
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-24,10
+24,15
@@
all:
install: install-python install-phpxmlrpc
install-python:
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
# 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 \
# python3 setup.py install \
# --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
# --install-scripts=$(DESTDIR)/$(datadir)/plc_api \