[CRIU] [PATCH 1/2] Makefile nitpicks

[Kir Kolyshkin]

1. As __nmk_dir already ends with a slash, there's no need
   for an extra one.

2. No need to include macro.mk into criu/Makefile -- nothing it defines
   is used from there.

Cc: Cyrill Gorcunov <gorcunov at openvz.org>
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 Documentation/Makefile | 4 ++--
 Makefile               | 4 ++--
 criu/Makefile          | 2 +-
 criu/Makefile.config   | 2 +-
 lib/Makefile           | 3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 77c4281..b1d7c79 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,6 +1,6 @@
 __nmk_dir ?= ../scripts/nmk/scripts/
-include $(__nmk_dir)/include.mk
-include $(__nmk_dir)/macro.mk
+include $(__nmk_dir)include.mk
+include $(__nmk_dir)macro.mk
 
 ASCIIDOC	:= asciidoc
 A2X		:= a2x
diff --git a/Makefile b/Makefile
index 05946a1..2536f7a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@
 __nmk_dir=$(CURDIR)/scripts/nmk/scripts/
 export __nmk_dir
 
-include $(__nmk_dir)/include.mk
-include $(__nmk_dir)/macro.mk
+include $(__nmk_dir)include.mk
+include $(__nmk_dir)macro.mk
 
 #
 # To build host helpers.
diff --git a/criu/Makefile b/criu/Makefile
index ba973e7..79cf23b 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -35,7 +35,7 @@ ifneq ($(filter ia32 x86 ppc64,$(ARCH)),)
 endif
 
 # msg-* printing
-include $(__nmk_dir)/msg.mk
+include $(__nmk_dir)msg.mk
 
 #
 # Needed libraries checks
diff --git a/criu/Makefile.config b/criu/Makefile.config
index 73ba005..f79868b 100644
--- a/criu/Makefile.config
+++ b/criu/Makefile.config
@@ -1,4 +1,4 @@
-include $(__nmk_dir)/utils.mk
+include $(__nmk_dir)utils.mk
 include $(__nmk_dir)msg.mk
 include $(SRC_DIR)/scripts/feature-tests.mak
 
diff --git a/lib/Makefile b/lib/Makefile
index f1c0821..d036893 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,4 @@
-include $(__nmk_dir)/include.mk
-include $(__nmk_dir)/macro.mk
+include $(__nmk_dir)include.mk
 
 CRIU_SO			:= libcriu.so
 UAPI_HEADERS		:= c/criu.h ../images/rpc.proto
-- 
2.7.4