X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=8a71a781b3a09ef41dad5ab5a4af731bc02f90b3;hb=9cc6f48a22342ef9c0738902ac932c24f9a812a7;hp=97061a57ef5ce487ea8efca156f603bae102b374;hpb=e48b0945a0f03a51019f72399ac9f0eeabb90211;p=plcapi.git

diff --git a/Makefile b/Makefile
index 97061a5..8a71a78 100644
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,20 @@ PWD := $(shell pwd)
 all: 
 	python setup.py build
 
-install: 
+install: install-python install-phpxmlrpc
+
+install-python:
 	python 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:
+	mkdir -p $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/
+	rsync --exclude .git -ai php/phpxmlrpc/ $(DESTDIR)/$(datadir)/plc_api/php/phpxmlrpc/
+
 clean: 
 	find . -name '*.pyc' | xargs rm -f
 	python setup.py clean && rm -rf build
@@ -73,12 +81,13 @@ sync:
 ifeq (,$(SSHURL))
 	@echo "sync: I need more info from the command line, e.g."
 	@echo "  make sync PLC=boot.planetlab.eu"
-	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTHOSTNAME=.. GUESTNAME=.."
 	@exit 1
 else
 	+$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
 	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
+	+$(RSYNC) apache/plc.wsgi $(SSHURL)/usr/share/plc_api/apache/
 	$(SSHCOMMAND) /etc/plc.d/httpd stop
 	$(SSHCOMMAND) /etc/plc.d/httpd start
 endif