summaryrefslogtreecommitdiffstats
path: root/src/pkg
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2021-04-29 18:47:25 +0200
committerAndrew Yourtchenko <ayourtch@gmail.com>2021-04-30 17:02:32 +0000
commit88b2e3682be6303973fc59c3c62141d64a9e10d7 (patch)
tree80337f9ba278dd3ebad7badb94f1ee9fd13a3bae /src/pkg
parent10796899cf3005df2575fb55be4956792db2c5d8 (diff)
misc: experimental configure script
Type: make Change-Id: Iaeb9d22eec9a7a763b63899814a44e78c8050f1f Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/pkg')
-rw-r--r--src/pkg/CMakeLists.txt10
-rwxr-xr-xsrc/pkg/debian/rules.in2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/CMakeLists.txt b/src/pkg/CMakeLists.txt
index e466fe8d345..d447774a1fd 100644
--- a/src/pkg/CMakeLists.txt
+++ b/src/pkg/CMakeLists.txt
@@ -41,7 +41,7 @@ set(VPP_DEB_WITH_PYTHON2 "no")
foreach(f rules changelog control)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/debian/${f}.in
- ${CMAKE_BINARY_DIR}/debian/${f}
+ ${VPP_BINARY_DIR}/debian/${f}
@ONLY
)
endforeach()
@@ -49,15 +49,15 @@ endforeach()
foreach(f copyright vpp.preinst vpp.postrm vpp.postinst vpp.service)
file(COPY
${CMAKE_CURRENT_SOURCE_DIR}/debian/${f}
- DESTINATION ${CMAKE_BINARY_DIR}/debian
+ DESTINATION ${VPP_BINARY_DIR}/debian
)
endforeach()
-file(WRITE ${CMAKE_BINARY_DIR}/debian/compat "10\n")
+file(WRITE ${VPP_BINARY_DIR}/debian/compat "10\n")
-add_custom_target(package-deb
+add_custom_target(pkg-deb
COMMENT "Building .deb packages..."
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ WORKING_DIRECTORY ${VPP_BINARY_DIR}
COMMAND "dpkg-buildpackage" "-us" "-uc" "-b"
USES_TERMINAL
)
diff --git a/src/pkg/debian/rules.in b/src/pkg/debian/rules.in
index 3249220b4f5..15f8eb6f810 100755
--- a/src/pkg/debian/rules.in
+++ b/src/pkg/debian/rules.in
@@ -30,7 +30,7 @@ override_dh_install:
@CMAKE_COMMAND@ \
-D CMAKE_INSTALL_CONFIG_NAME=@CMAKE_BUILD_TYPE@ \
-D CMAKE_INSTALL_COMPONENT=$$c \
- -D CMAKE_INSTALL_PREFIX=@CMAKE_BINARY_DIR@/debian/$$c \
+ -D CMAKE_INSTALL_PREFIX=@VPP_BINARY_DIR@/debian/$$c \
-P @CMAKE_BINARY_DIR@/cmake_install.cmake 2>&1 \
| grep -v 'Set runtime path of' ; \
if [ -d debian/$$c/lib ] ; then \