summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-12 19:46:44 +0000
committerSebastian Dröge <sebastian@centricular.com>2015-11-13 09:40:44 +0100
commit09aa20746a0fef97fb811c5503928c13a1f55eb5 (patch)
treea06e392579e4845e3ad3c95d5a21022868daca03
parent87691d02805a26ebf62eb613b7e7a1d760243fd5 (diff)
helpers: fix install race
The install hook needs to be a install-data-hook not an install-exec-hook as the helpers are installed into helperdir which is considered data (only path variables with "exec" in are considered executables). The explicit dependency on install-helpersPROGRAMS was an attempt at solving this, but this causes occasional races where install-helpersPROGRAMS can run twice in parallel (once via install-all, once via the hook's dependency). https://bugzilla.gnome.org/show_bug.cgi?id=758029
-rw-r--r--libs/gst/helpers/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gst/helpers/Makefile.am b/libs/gst/helpers/Makefile.am
index 0ae9ab061..2530a34ec 100644
--- a/libs/gst/helpers/Makefile.am
+++ b/libs/gst/helpers/Makefile.am
@@ -23,7 +23,7 @@ gst_ptp_helper_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
gst_ptp_helper_LDADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(CAP_LIBS)
endif
-install-exec-hook: install-helpersPROGRAMS
+install-data-hook:
if HAVE_PTP
if HAVE_PTP_HELPER_SETUID
- chown root $(DESTDIR)$(helpersdir)/gst-ptp-helper