summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Glombek <christian.glombek@rwth-aachen.de>2018-02-01 14:49:44 +0100
committerAndras Timar <andras.timar@collabora.com>2018-02-04 22:27:09 +0100
commit51993b8990c8eb0123e860088df09e3ad6436079 (patch)
treef70d4c731d7d50e535fa5cbf6b5269dbe01cac09 /debian
parent34aed93d839f99f46874ae744fa95c269f086d9e (diff)
Adds ENABLE_SETCAP build variable to avoid using env in build system.
Change-Id: Id38d2225238f8b3a48481a08e62cfa7544958cc9 Reviewed-on: https://gerrit.libreoffice.org/49097 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules6
1 files changed, 1 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules
index 976dbde7e..fe3d10b33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
-CONFFLAGS = --enable-silent-rules --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
-
-# Avoid setcap when doing "make", when building for packaging
-# the setcap is done at installation time
-export BUILDING_FROM_RPMBUILD=yes
+CONFFLAGS = --enable-silent-rules --prefix=/usr --localstatedir=/var --sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include --disable-setcap $(CONFIG_OPTIONS)
# main packaging script based on dh7 syntax
%: