diff --git a/Makefile.in b/Makefile.in index d64bbd030..3eaa77e21 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,18 +125,19 @@ umu-launcher-dist-install: umu-launcher-install: umu-launcher-dist-install umu-launcher-bin-install -$(OBJDIR)/.build-python-xlib: | $(OBJDIR) - $(info :: Building python-xlib ) - cd subprojects/python-xlib && \ - $(PYTHON_INTERPRETER) setup.py build +$(OBJDIR)/.build-umu-subprojects: | $(OBJDIR) + $(info :: Building subprojects ) + pip install -r requirements.in -t $(OBJDIR) -.PHONY: python-xlib -python-xlib: $(OBJDIR)/.build-python-xlib +.PHONY: umu-subprojects +umu-subprojects: $(OBJDIR)/.build-umu-subprojects -python-xlib-install: - $(info :: Installing python-xlib ) +umu-subprojects-install: + $(info :: Installing subprojects ) install -d $(DESTDIR)$(PYTHONDIR) - cp -r subprojects/python-xlib/build/lib/Xlib $(DESTDIR)$(PYTHONDIR) + cp -r $(OBJDIR)/*-info $(DESTDIR)$(PYTHONDIR) + cp -r $(OBJDIR)/Xlib $(DESTDIR)$(PYTHONDIR) + cp $(OBJDIR)/six.py $(DESTDIR)$(PYTHONDIR) $(OBJDIR): @mkdir -p $(@) diff --git a/README.md b/README.md index 3d510a40a..86e1dc57c 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,13 @@ Change the `--prefix` as fit for your distribution, for example `/usr/local`, or Then run `make` to build. After a successful build the resulting files should be available in the `./builddir` directory +**Note**: For umu clients, [pip](https://github.com/pypa/pip) is required to build its Python dependencies and they will need to be put within same directory as the runtime directory (e.g., `$HOME/.config/heroic/tools/runtimes/umu`). + +To build all dependencies: +```shell +make DESTDIR= umu-subprojects +``` + ### Installing To install umu-launcher run the following command after completing the steps described above ```shell @@ -102,6 +109,11 @@ or if you are packaging umu-launcher make DESTDIR= install ``` +**Note**: For umu clients, to install all of its dependencies, run: +```shell +make DESTDIR= umu-subprojects-install +``` + ### Installing as user If you want to install umu just for your user, or for quickly testing, you can configure umu with the following command ```shell