[CRIU] [PATCH 2/2] build: Makefile -- link soccr config with relative name

Cyrill Gorcunov gorcunov at openvz.org
Thu Jan 12 05:33:13 PST 2017


Config header must be with abs path, so link the soccr
name with relative one.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8bcb3078446e..93d6fce90bdc 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,8 @@ endif
 
 #
 # Configure variables.
-export CONFIG_HEADER := criu/include/config.h
+CONFIG_HEADER_REL := criu/include/config.h
+export CONFIG_HEADER := $(SRC_DIR)/$(CONFIG_HEADER_REL)
 ifeq ($(filter clean mrproper,$(MAKECMDGOALS)),)
 include $(SRC_DIR)/Makefile.config
 endif
@@ -206,7 +207,7 @@ $(eval $(call gen-built-in,images))
 SOCCR_A := soccr/libsoccr.a
 SOCCR_CONFIG := $(SRC_DIR)/soccr/config.h
 $(SOCCR_CONFIG): $(CONFIG_HEADER)
-	$(Q) test -f $@ || ln -s ../$(CONFIG_HEADER) $@
+	$(Q) test -f $@ || ln -s ../$(CONFIG_HEADER_REL) $@
 soccr/%: $(SOCCR_CONFIG) .FORCE
 	$(Q) $(MAKE) $(build)=soccr $@
 soccr/built-in.o: $(SOCCR_CONFIG) .FORCE
-- 
2.7.4



More information about the CRIU mailing list