[gnome-multi-writer] build: Move gnome-multi-writer-probe to libexecdir
- From: Michael Biebl <mbiebl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-multi-writer] build: Move gnome-multi-writer-probe to libexecdir
- Date: Sun, 4 Sep 2016 16:25:48 +0000 (UTC)
commit 47ff796d929070b07a6576f02e86ace71bb693d9
Author: Michael Biebl <biebl debian org>
Date: Sun Sep 4 16:03:59 2016 +0200
build: Move gnome-multi-writer-probe to libexecdir
gnome-multi-writer-probe is a helper binary which is not supposed to be
run directly by the user, so move it to libexecdir.
configure.ac | 1 +
src/Makefile.am | 7 +++++--
src/gmw-main.c | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 298a61c..3c8d6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,7 @@ echo "
prefix: ${prefix}
datadir: ${datadir}
+ libexecdir: ${libexecdir}
compiler: ${CC}
cflags: ${CFLAGS}
cppflags: ${CPPFLAGS}
diff --git a/src/Makefile.am b/src/Makefile.am
index 756f99b..8084a1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,13 @@ AM_CPPFLAGS = \
$(UDISKS_CFLAGS) \
-DG_LOG_DOMAIN=\"GnomeMultiWriter\" \
-DG_USB_API_IS_SUBJECT_TO_CHANGE \
- -DLOCALEDIR=\""$(localedir)"\"
+ -DLOCALEDIR=\""$(localedir)"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\"
+
+libexec_PROGRAMS = \
+ gnome-multi-writer-probe
bin_PROGRAMS = \
- gnome-multi-writer-probe \
gnome-multi-writer
gnome_multi_writer_LDADD = \
diff --git a/src/gmw-main.c b/src/gmw-main.c
index c824724..5aa7617 100644
--- a/src/gmw-main.c
+++ b/src/gmw-main.c
@@ -888,7 +888,7 @@ gmw_block_device_probe (const gchar *block_dev, GError **error)
gint exit_status = 0;
g_autofree gchar *standard_output = NULL;
const gchar *argv[] = { "/usr/bin/pkexec",
- "/usr/bin/gnome-multi-writer-probe",
+ LIBEXECDIR"/gnome-multi-writer-probe",
block_dev,
NULL };
const gchar *envp[] = { NULL };
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]