diff options
author | 2023-02-14 09:10:02 -0500 | |
---|---|---|
committer | 2023-02-14 09:10:02 -0500 | |
commit | 7fcb9ce9e576e5bbf5b40b0041d3bcfd29a3d3bc (patch) | |
tree | 226fccfa950c5081c5ec54992c663dc4ba6b227e | |
parent | Merge pull request #5660 from glitsj16/tmc-fix (diff) | |
parent | build: mkdeb.sh: pass all arguments to ./configure (diff) | |
download | firejail-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-- | Makefile | 2 | ||||
-rwxr-xr-x | mkdeb.sh | 4 |
2 files changed, 1 insertions, 5 deletions
@@ -342,7 +342,7 @@ deb: dist config.sh | |||
342 | 342 | ||
343 | .PHONY: deb-apparmor | 343 | .PHONY: deb-apparmor |
344 | deb-apparmor: dist config.sh | 344 | deb-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 |
348 | test-compile: dist config.mk | 348 | test-compile: dist config.mk |
@@ -10,10 +10,6 @@ set -e | |||
10 | 10 | ||
11 | . "$(dirname "$0")/config.sh" | 11 | . "$(dirname "$0")/config.sh" |
12 | 12 | ||
13 | EXTRA_VERSION=$1 | ||
14 | |||
15 | test "$#" -gt 0 && shift | ||
16 | |||
17 | CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz" | 13 | CODE_ARCHIVE="$TARNAME-$VERSION.tar.xz" |
18 | CODE_DIR="$TARNAME-$VERSION" | 14 | CODE_DIR="$TARNAME-$VERSION" |
19 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" | 15 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" |