[CRIU] [PATCH 11/12] build: crit -- Fix install target

[Cyrill Gorcunov]

From: Tycho Andersen <tycho.andersen at canonical.com>

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Makefile.install                      | 2 +-
 lib/Makefile                          | 4 ++--
 lib/{py => pycriu}/.gitignore         | 0
 lib/{py => pycriu}/Makefile           | 0
 lib/{py => pycriu}/__init__.py        | 0
 lib/{py => pycriu}/criu.py            | 0
 lib/{py => pycriu}/images/.gitignore  | 0
 lib/{py => pycriu}/images/Makefile    | 0
 lib/{py => pycriu}/images/__init__.py | 0
 lib/{py => pycriu}/images/images.py   | 0
 lib/{py => pycriu}/images/pb2dict.py  | 0
 scripts/crit-setup.py                 | 3 ++-
 12 files changed, 5 insertions(+), 4 deletions(-)
 rename lib/{py => pycriu}/.gitignore (100%)
 rename lib/{py => pycriu}/Makefile (100%)
 rename lib/{py => pycriu}/__init__.py (100%)
 rename lib/{py => pycriu}/criu.py (100%)
 rename lib/{py => pycriu}/images/.gitignore (100%)
 rename lib/{py => pycriu}/images/Makefile (100%)
 rename lib/{py => pycriu}/images/__init__.py (100%)
 rename lib/{py => pycriu}/images/images.py (100%)
 rename lib/{py => pycriu}/images/pb2dict.py (100%)

diff --git a/Makefile.install b/Makefile.install
index ffd496f7a651..dfb65452d6ce 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -24,7 +24,7 @@ install-criu: all $(CRIU-LIB) install-crit
 install-man:
 	$(Q) $(MAKE) -C Documentation install
 
-install-crit: crit
+install-crit: crit/crit
 	$(E) "  INSTALL crit"
 	$(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
 
diff --git a/lib/Makefile b/lib/Makefile
index d1b0450599f8..3c0decbe03f6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -27,7 +27,7 @@ PHONY += lib-c
 # Python bindings.
 lib-py:
 	$(call msg-gen, $@)
-	$(Q) $(MAKE) -C py/images all
+	$(Q) $(MAKE) -C pycriu/images all
 PHONY += lib-py
 
 clean:
@@ -35,7 +35,7 @@ clean:
 	$(Q) $(MAKE) $(build)=c $@
 	$(Q) $(RM) c/$(CRIU_SO)
 	$(call msg-clean, lib-py)
-	$(Q) $(MAKE) -C py/images $@
+	$(Q) $(MAKE) -C pycriu/images $@
 
 all: $(PHONY)
 	@true
diff --git a/lib/py/.gitignore b/lib/pycriu/.gitignore
similarity index 100%
rename from lib/py/.gitignore
rename to lib/pycriu/.gitignore
diff --git a/lib/py/Makefile b/lib/pycriu/Makefile
similarity index 100%
rename from lib/py/Makefile
rename to lib/pycriu/Makefile
diff --git a/lib/py/__init__.py b/lib/pycriu/__init__.py
similarity index 100%
rename from lib/py/__init__.py
rename to lib/pycriu/__init__.py
diff --git a/lib/py/criu.py b/lib/pycriu/criu.py
similarity index 100%
rename from lib/py/criu.py
rename to lib/pycriu/criu.py
diff --git a/lib/py/images/.gitignore b/lib/pycriu/images/.gitignore
similarity index 100%
rename from lib/py/images/.gitignore
rename to lib/pycriu/images/.gitignore
diff --git a/lib/py/images/Makefile b/lib/pycriu/images/Makefile
similarity index 100%
rename from lib/py/images/Makefile
rename to lib/pycriu/images/Makefile
diff --git a/lib/py/images/__init__.py b/lib/pycriu/images/__init__.py
similarity index 100%
rename from lib/py/images/__init__.py
rename to lib/pycriu/images/__init__.py
diff --git a/lib/py/images/images.py b/lib/pycriu/images/images.py
similarity index 100%
rename from lib/py/images/images.py
rename to lib/pycriu/images/images.py
diff --git a/lib/py/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
similarity index 100%
rename from lib/py/images/pb2dict.py
rename to lib/pycriu/images/pb2dict.py
diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py
index 38e3647f1508..fbdc66518e40 100644
--- a/scripts/crit-setup.py
+++ b/scripts/crit-setup.py
@@ -6,6 +6,7 @@ setup(name = "crit",
       author = "CRIU team",
       author_email = "criu at openvz.org",
       url = "https://github.com/xemul/criu",
+      package_dir = {'': "lib"},
       packages = ["pycriu", "pycriu.images"],
-      scripts = ["crit"]
+      scripts = ["crit/crit"]
       )
-- 
2.5.0