aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2023-02-14 09:10:02 -0500
committerLibravatar GitHub <noreply@github.com>2023-02-14 09:10:02 -0500
commit7fcb9ce9e576e5bbf5b40b0041d3bcfd29a3d3bc (patch)
tree226fccfa950c5081c5ec54992c663dc4ba6b227e
parentMerge pull request #5660 from glitsj16/tmc-fix (diff)
parentbuild: mkdeb.sh: pass all arguments to ./configure (diff)
downloadfirejail-7fcb9ce9e576e5bbf5b40b0041d3bcfd29a3d3bc.tar.gz
firejail-7fcb9ce9e576e5bbf5b40b0041d3bcfd29a3d3bc.tar.zst
firejail-7fcb9ce9e576e5bbf5b40b0041d3bcfd29a3d3bc.zip
Merge pull request #5654 from kmk3/build-mkdeb-noargs
build: mkdeb.sh: pass all arguments to ./configure
-rw-r--r--Makefile2
-rwxr-xr-xmkdeb.sh4
2 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 010f7f0aa..ad6c39001 100644
--- a/Makefile
+++ b/Makefile
@@ -342,7 +342,7 @@ deb: dist config.sh
342 342
343.PHONY: deb-apparmor 343.PHONY: deb-apparmor
344deb-apparmor: dist config.sh 344deb-apparmor: dist config.sh
345 ./mkdeb.sh -apparmor --enable-apparmor 345 env EXTRA_VERSION=-apparmor ./mkdeb.sh --enable-apparmor
346 346
347.PHONY: test-compile 347.PHONY: test-compile
348test-compile: dist config.mk 348test-compile: dist config.mk
diff --git a/mkdeb.sh b/mkdeb.sh
index 5f65e80b2..a0fc01234 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -10,10 +10,6 @@ set -e
10 10
11. "$(dirname "$0")/config.sh" 11. "$(dirname "$0")/config.sh"
12 12
13EXTRA_VERSION=$1
14
15test "$#" -gt 0 && shift
16
17CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz" 13CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz"
18CODE_DIR="$TARNAME-$VERSION" 14CODE_DIR="$TARNAME-$VERSION"
19INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" 15INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"