update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/spdk/dpdk/examples/ip_pipeline/Makefile b/ceph/src/spdk/dpdk/examples/ip_pipeline/Makefile
index 409966afde29a9aaabf261948681038546d89698..3a0193818ffb96b29fb14b0f5ef47567470d9cf1 100644 (file)
--- a/ceph/src/spdk/dpdk/examples/ip_pipeline/Makefile
+++ b/ceph/src/spdk/dpdk/examples/ip_pipeline/Makefile
@@ -21,8 +21,7 @@ SRCS-y += tmgr.c
 SRCS-y += cryptodev.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
@@ -31,10 +30,12 @@ shared: build/$(APP)-shared
 static: build/$(APP)-static
        ln -sf $(APP)-static build/$(APP)
 
-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 += -I.
 
@@ -55,7 +56,7 @@ build:
 .PHONY: clean
 clean:
        rm -f build/$(APP)* build/*.o
-       rmdir --ignore-fail-on-non-empty build
+       test -d build && rmdir -p build || true
 
 else