summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-08-16 15:40:55 +1000
committerDaniel Black <daniel@mariadb.org>2021-08-16 15:41:26 +1000
commit3d16e0e16c649505f06b39b7f7e800494ba0fef9 (patch)
tree01c7fdc4291bb3f572b562150cb360ecaf570727 /debian
parent0268b8712288d46fbd8a43fdef6bada399b68dff (diff)
downloadmariadb-git-3d16e0e16c649505f06b39b7f7e800494ba0fef9.tar.gz
deb: columnstore not 32bit (fix)
Fix for previous commit, shell logic for repeat configure stages corrected to use subshell.
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules3
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index 184a7733159..13e5c5e57a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,7 @@ ifneq (32,$(DEB_HOST_ARCH_BITS))
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
# Don't include twice
grep -q '^Package: mariadb-plugin-columnstore$$' debian/control || \
- echo >> debian/control && \
- cat storage/columnstore/columnstore/debian/control >> debian/control
+ ( echo && cat storage/columnstore/columnstore/debian/control ) >> debian/control
endif
echo "server:Version=$(DEB_VERSION)" >> debian/substvars