diff options
| author | Simon McVittie <smcv@debian.org> | 2016-07-06 12:44:16 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2016-08-01 11:28:45 +0100 |
| commit | f9666055638a469945ef021a8cad7cba9108b88b (patch) | |
| tree | 84d3fe6bdb390c0d075f20120314e270db8a0781 /Makefile.am | |
| parent | 07b342a937ed562a59aa649d793771babee57a09 (diff) | |
| download | flatpak-f9666055638a469945ef021a8cad7cba9108b88b.tar.gz | |
build: run install-test-data-hook even if using system bwrap
The !WITH_SYSTEM_BWRAP conditional was too broad here.
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0814d39c..0fa2da8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,18 +95,20 @@ flatpak_bwrap_LDADD = $(bwrap_LDADD) bwrapdir = $(libexecdir) include bubblewrap/Makefile-bwrap.am.inc +endif # !WITH_SYSTEM_BWRAP + # NOTE: bwrap is install-bwrapPROGS which is run from install-data, not install-exec, this data-hook is used install-data-hook: $(MAKE) $(AM_MAKEFLAGS) install-test-data-hook +if !WITH_SYSTEM_BWRAP if PRIV_MODE_SETUID $(SUDO_BIN) chown root $(DESTDIR)$(libexecdir)/flatpak-bwrap $(SUDO_BIN) chmod u+s $(DESTDIR)$(libexecdir)/flatpak-bwrap else if PRIV_MODE_FILECAPS $(SUDO_BIN) setcap cap_sys_admin,cap_net_admin,cap_sys_chroot,cap_setuid,cap_setgid+ep $(DESTDIR)$(libexecdir)/flatpak-bwrap -endif -endif - +endif # PRIV_MODE_FILECAPS +endif # !PRIV_MODE_SETUID endif # !WITH_SYSTEM_BWRAP completiondir = $(datadir)/bash-completion/completions |