diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-12-04 17:39:29 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-12-07 12:54:53 +0300 |
| commit | b08946cd1bb24943fcc41e545ae345c500c33252 (patch) | |
| tree | d2879b2b42896f7560a286e19aaf5c46cd630cbc | |
| parent | 057fc558359c63b212d596179cb0a0b658142010 (diff) | |
helpers: really fix install race
My previous fix for #758029 wasn't quite right and simply made the race rarer.
Some of the files are installed by install-exec and others by install-exec, so
the hooks need to be split too.
https://bugzilla.gnome.org/show_bug.cgi?id=758029
| -rw-r--r-- | libs/gst/helpers/Makefile.am | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am index 2530a34ec7..00677791cf 100644 --- a/libs/gst/helpers/Makefile.am +++ b/libs/gst/helpers/Makefile.am @@ -23,17 +23,8 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS) gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS) endif -install-data-hook: -if HAVE_PTP -if HAVE_PTP_HELPER_SETUID - - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper - - chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper -endif -if HAVE_PTP_HELPER_CAPABILITIES - - $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper -endif -endif if ENABLE_BASH_COMPLETION +install-exec-hook: $(MKDIR_P) $(DESTDIR)$(BASH_HELPERS_DIR) && \ cd $(DESTDIR)$(bindir) && \ $(INSTALL) `echo "gst-completion-helper-" | sed '$(transform)'`@GST_API_VERSION@$(EXEEXT) \ @@ -44,6 +35,17 @@ uninstall-hook: rm -f $(DESTDIR)$(BASH_HELPERS_DIR)/gst-completion-helper-@GST_API_VERSION@$(EXEEXT) endif +install-data-hook: +if HAVE_PTP +if HAVE_PTP_HELPER_SETUID + - chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper + - chmod u+s $(DESTDIR)$(helpersdir)/gst-ptp-helper +endif +if HAVE_PTP_HELPER_CAPABILITIES + - $(SETCAP) cap_net_bind_service,cap_net_admin+ep $(DESTDIR)$(helpersdir)/gst-ptp-helper +endif +endif + # clean out the old one to make sure everything is udpated correctly # remove again after release CLEANFILES = plugin-scanner |