misc: experimental configure script

[vpp.git] / build-data / packages / vpp.mk

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 6571cd2..7db450e 100644 (file)
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -37,8 +37,8 @@ endif
 endif
 
 # Use devtoolset on centos 7
-ifneq ($(wildcard /opt/rh/devtoolset-7/enable),)
-vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin"
+ifneq ($(wildcard /opt/rh/devtoolset-9/enable),)
+vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin"
 endif
 
 ifneq ($(VPP_EXTRA_CMAKE_ARGS),)
@@ -54,8 +54,8 @@ vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS)
 vpp_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path'
 
 vpp-package-deb: vpp-install
-       @$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vpp -- package-deb
+       @$(CMAKE) --build $(PACKAGE_BUILD_DIR)/vpp -- pkg-deb
        @find $(PACKAGE_BUILD_DIR) \
-          -maxdepth 1 \
+          -maxdepth 2 \
           \( -name '*.changes' -o -name '*.deb' -o -name '*.buildinfo' \) \
           -exec mv {} $(CURDIR) \;