tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1commit 353794feb596d95e3f8893e39b174c5a89d1013e
2Author: Arthur Gautier <baloo@superbaloo.net>
3Date: Wed Feb 17 02:27:40 2021 +0000
4
5 python-install
6
7 Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
8
9diff --git a/samples/Makefile.am b/samples/Makefile.am
10index 7d69bf8..1803bb9 100644
11--- a/samples/Makefile.am
12+++ b/samples/Makefile.am
13@@ -39,19 +39,9 @@ python-uninstall:
14 $(PIP3) uninstall -y $(PY_PACKAGE_NAME)
15
16 if PYTHON_INSTALLATION
17-install-exec-local: $(PY_PACKAGE)
18- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
19- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
20- else \
21- $(MAKE) python-install; \
22- fi
23+install-exec-local: python-install
24
25-uninstall-local:
26- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
27- echo "Cleanup for distcheck build not implemented" ; \
28- else \
29- $(MAKE) python-uninstall; \
30- fi
31+uninstall-local: python-uninstall
32 endif
33
34
35diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
36index 529eefe..533b1b3 100644
37--- a/src/swtpm_setup/Makefile.am
38+++ b/src/swtpm_setup/Makefile.am
39@@ -29,19 +29,9 @@ python-uninstall:
40 $(PIP3) uninstall -y $(PY_PACKAGE_NAME)
41
42 if PYTHON_INSTALLATION
43-install-exec-local: $(PY_PACKAGE)
44- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
45- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \
46- else \
47- $(MAKE) python-install; \
48- fi
49+install-exec-local: python-install
50
51-uninstall-local:
52- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \
53- echo "Cleanup for distcheck build not implemented" ; \
54- else \
55- $(MAKE) python-uninstall; \
56- fi
57+uninstall-local: python-uninstall
58 endif
59
60 # for out-of-tree builds we need to clean up