review packaging for f37 (1/n)

[plcapi.git] / Makefile

diff --git a/Makefile b/Makefile
index 0c546e3..b138e05 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,14 @@ all:
 install: install-python install-phpxmlrpc
 
 install-python:
-       python3 setup.py install \
-           --install-purelib=$(DESTDIR)/$(datadir)/plc_api \
-           --install-scripts=$(DESTDIR)/$(datadir)/plc_api \
-           --install-data=$(DESTDIR)/$(datadir)/plc_api
+       pip install --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
+       # 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