update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / examples / vhost / Makefile

diff --git a/ceph/src/spdk/dpdk/examples/vhost/Makefile b/ceph/src/spdk/dpdk/examples/vhost/Makefile
index 80607b79c5c6e0b8b820c8bc57b74390bfbf7a0e..f2b1615418c9cd8d0689f69ea6d889bb8a4a48ef 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/vhost/Makefile
+++ b/ceph/src/spdk/dpdk/examples/vhost/Makefile
@@ -8,8 +8,7 @@ APP = vhost-switch
 SRCS-y := main.c virtio_net.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
 .PHONY: shared static
@@ -20,10 +19,12 @@ static: build/$(APP)-static
 
 LDFLAGS += -pthread
 
-PC_FILE := $(shell pkg-config --path libdpdk)
-CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)
-LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)
-LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)
+PKGCONF ?= pkg-config
+
+PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
+CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
+LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
 
 CFLAGS += -DALLOW_EXPERIMENTAL_API
 
@@ -39,7 +40,7 @@ build:
 .PHONY: clean
 clean:
        rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
-       rmdir --ignore-fail-on-non-empty build
+       test -d build && rmdir -p build || true
 
 else # Build using legacy build system