X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=7eb496935c2a1aec1e31575aeff1264bf11ea90d;hb=4facb0674ab3f9e2deac6e92717b71cbd05f3c10;hp=0c546e361912df0a76f2d023b4cdbc99194e3a63;hpb=aeae61fcf24491935e5ae24ae99c7a33e9c18b00;p=plcapi.git diff --git a/Makefile b/Makefile index 0c546e3..7eb4969 100644 --- a/Makefile +++ b/Makefile @@ -21,17 +21,26 @@ PWD := $(shell pwd) all: python3 setup.py build -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 - -# phpxmlrpc is a git subtree; we just ship all its contents -# under /usr/share/plc_api/php/phpxmlrpc -install-phpxmlrpc: +# 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 + 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 + mv $(DESTDIR)/$(datadir)/plc_api/bin/Server.py $(DESTDIR)/$(datadir)/plc_api + # the old recipe used to read + # 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 mkdir -p $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/ rsync --exclude .git -ai php/phpxmlrpc/ $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/