update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / ocf / Makefile

diff --git a/ceph/src/spdk/ocf/Makefile b/ceph/src/spdk/ocf/Makefile
index 1a22ffaabdcf2b4d531936fbf7b86a16a377a971..5a65d20de94acd8e346f05ea7672cfd041bb599d 100644 (file)
--- a/ceph/src/spdk/ocf/Makefile
+++ b/ceph/src/spdk/ocf/Makefile
@@ -15,7 +15,7 @@ ifeq ($(strip $(OUTDIR)),)
 endif
 
 ifeq ($(strip $(CMD)),)
-INSTALL=ln -s
+INSTALL=ln -fs
 else ifeq ($(strip $(CMD)),cp)
 INSTALL=cp
 else ifeq ($(strip $(CMD)),install)
@@ -24,9 +24,9 @@ else
 $(error Not allowed program command)
 endif
 
-ifneq ($(strip $(ENV)),)
-ifeq ($(strip $(ENV)),posix)
-ENVDIR=$(PWD)/env/posix
+ifneq ($(strip $(OCF_ENV)),)
+ifeq ($(strip $(OCF_ENV)),posix)
+OCF_ENV_DIR=$(PWD)/env/posix
 else
 $(error Invalid environment selected)
 endif
@@ -79,30 +79,30 @@ $(SRC_RM): validate
 #
 # Installing environment
 #
-ENV_IN=$(shell find $(ENVDIR) -name '*.[c|h]' -type f)
-ENV_OUT=$(patsubst $(ENVDIR)%,$(OUTDIR)/src/ocf/env/%,$(ENV_IN))
-ENV_RM=$(shell find $(OUTDIR)/src/ocf/env -name '*.[c|h]' -xtype l 2>/dev/null)
+OCF_ENV_IN=$(shell find $(OCF_ENV_DIR) -name '*.[c|h]' -type f)
+OCF_ENV_OUT=$(patsubst $(OCF_ENV_DIR)%,$(OUTDIR)/src/ocf/env/%,$(OCF_ENV_IN))
+OCF_ENV_RM=$(shell find $(OUTDIR)/src/ocf/env -name '*.[c|h]' -xtype l 2>/dev/null)
 
 env: | env_check env_dep
        @$(MAKE) distcleandir
 
 env_check:
-ifeq ($(ENVDIR),)
+ifeq ($(OCF_ENV_DIR),)
        $(error No environment selected)
 endif
 
-env_dep: $(ENV_OUT) $(ENV_RM)
+env_dep: $(OCF_ENV_OUT) $(OCF_ENV_RM)
 
-$(ENV_OUT):
+$(OCF_ENV_OUT):
 ifeq ($(strip $(OUTDIR)),)
        $(error No output specified for installing sources)
 endif
        @echo " INSTALL  $@"
        @mkdir -p $(dir $@)
-       @$(INSTALL) $(subst $(OUTDIR)/src/ocf/env,$(ENVDIR),$@) $@
+       @$(INSTALL) $(subst $(OUTDIR)/src/ocf/env,$(OCF_ENV_DIR),$@) $@
 
-$(ENV_RM): validate
-       $(if $(shell readlink $@ | grep $(ENVDIR)), \
+$(OCF_ENV_RM): validate
+       $(if $(shell readlink $@ | grep $(OCF_ENV_DIR)), \
                @echo "  RM      $@"; rm $@,)
 
 #
@@ -134,4 +134,4 @@ doc: validate
        @cd doc && mv html $(OUTDIR)/doc/ocf
 
 .PHONY: inc src env env_check env_dep validate help distclean distcleandir doc \
-    $(INC_RM) $(SRC_RM) $(ENV_RM) $(DIST_DIR)
+    $(INC_RM) $(SRC_RM) $(OCF_ENV_RM) $(DIST_DIR)