From ec9ab827b1daa58c292f9da06b9e3d34a39bb8c6 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 31 Dec 2014 14:06:52 +0200 Subject: [PATCH] crit: add install-crit target to Makefile install-crit uses scripts/crit-setup.py install --prefix=$(DESTDIR) to act the way the install target expects it too. Signed-off-by: Ruslan Kuprieiev Signed-off-by: Pavel Emelyanov --- .gitignore | 1 + Makefile | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2391e909c..977c782aa 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ pie/pie.lds.S include/config.h protobuf-desc-gen.h criu.pc +build diff --git a/Makefile b/Makefile index b0d6e32af..1bc7fa070 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ ifeq ($(GCOV),1) %.o $(PROGRAM): override CFLAGS += --coverage endif -all: config pie $(VERSION_HEADER) $(CRIU-LIB) +all: config pie $(VERSION_HEADER) $(CRIU-LIB) crit $(Q) $(MAKE) $(PROGRAM) protobuf/%:: @@ -231,6 +231,7 @@ clean: clean-built $(Q) $(MAKE) -C test $@ $(Q) $(MAKE) -C pycriu $@ $(Q) $(RM) ./*.pyc + $(Q) $(RM) -r build distclean: clean $(E) " DISTCLEAN" @@ -257,7 +258,7 @@ criu-$(CRTOOLSVERSION).tar.bz2: v$(CRTOOLSVERSION) | bzip2 > $@ .PHONY: dist tar -install: $(PROGRAM) $(CRIU-LIB) install-man +install: $(PROGRAM) $(CRIU-LIB) install-man install-crit $(E) " INSTALL " $(PROGRAM) $(Q) mkdir -p $(DESTDIR)$(SBINDIR) $(Q) install -m 755 $(PROGRAM) $(DESTDIR)$(SBINDIR) @@ -285,7 +286,11 @@ install: $(PROGRAM) $(CRIU-LIB) install-man install-man: $(Q) $(MAKE) -C Documentation install -.PHONY: install install-man +install-crit: crit + $(E) " INSTALL crit" + $(Q) python scripts/crit-setup.py install --prefix=$(DESTDIR) + +.PHONY: install install-man install-crit help: @echo ' Targets:'