Moved "captive-sandbox-server" to not to confuse users: sbin -> libexec

 - And OK, it is really the appropriate directory for it.

diff --git a/captive.spec.in b/captive.spec.in
index ef38363..f4411f3 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -164,7 +164,7 @@ rm -rf %{_var}/lib/@PACKAGE@/tmp/*
 %{_libdir}/gnome-vfs-2.0/modules/lib@PACKAGE@-gnomevfs.so
 %{_bindir}/@PACKAGE@-cmdline
 %attr(644,root,root) %{_mandir}/man?/@PACKAGE@-cmdline.*
-%attr(4755,root,root) %{_sbindir}/@PACKAGE@-sandbox-server
+%attr(4755,root,root) %{_libexecdir}/@PACKAGE@-sandbox-server
 %attr(644,root,root) %{_mandir}/man?/@PACKAGE@-sandbox-server.*
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/@PACKAGE@.conf
 %{_datadir}/locale/*/LC_MESSAGES/@PACKAGE@.mo

diff --git a/src/client/fuse/Makefile.am b/src/client/fuse/Makefile.am
index 444a6e4..d1210b1 100644 (file)
--- a/src/client/fuse/Makefile.am
+++ b/src/client/fuse/Makefile.am
@@ -68,7 +68,7 @@ mount_captive_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(FUSE_CFLAGS)
 mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
 mount_captive_LDFLAGS=$(READLINE_LDFLAGS)
 
-mount_captive_CFLAGS+=-DSBINDIR="$(sbindir)"
+mount_captive_CFLAGS+=-DLIBEXECDIR="$(libexecdir)"
 mount_captive_CFLAGS+=-DVARLIBCAPTIVEDIR="$(localstatedir)/lib/$(PACKAGE)"
 
 if ENABLE_FUSE

diff --git a/src/client/fuse/main.c b/src/client/fuse/main.c
index 50942da..27c90dc 100644 (file)
--- a/src/client/fuse/main.c
+++ b/src/client/fuse/main.c
@@ -123,7 +123,7 @@ const char **rest_argv,**csp;
 struct captive_options options;
 const char **capfuse_argv;
 const char *program_name=argv[0];
-const char *sandbox_server_argv0=G_STRINGIFY(SBINDIR) "/captive-sandbox-server";
+const char *sandbox_server_argv0=G_STRINGIFY(LIBEXECDIR) "/captive-sandbox-server";
 const char *image_filename;
 
        g_log_set_always_fatal(~(0

diff --git a/src/client/lufs/mount.captive.in b/src/client/lufs/mount.captive.in
index 33725c1..3e0a47f 100755 (executable)
--- a/src/client/lufs/mount.captive.in
+++ b/src/client/lufs/mount.captive.in
@@ -30,10 +30,10 @@ $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge;
 $vardir="/var/lib/captive" if $vardir=~/^@/;
 my $lufsd_bin='@PATH_LUFSD@';
 $lufsd_bin="/usr/bin/lufsd" if $lufsd_bin=~/^@/;
-my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server';
+my $captive_sandbox_server_bin='@libexecdir@/captive-sandbox-server';
 $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
 $captive_sandbox_server_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
-$captive_sandbox_server_bin="/usr/sbin/captive-sandbox-server" if $captive_sandbox_server_bin=~/^@/;
+$captive_sandbox_server_bin="/usr/libexec/captive-sandbox-server" if $captive_sandbox_server_bin=~/^@/;
 
 
 my $ME=($0=~m#([^/]*)$#)[0] or die "Cannot detetect my basename from: $0";

diff --git a/src/client/sandbox-server/Makefile.am b/src/client/sandbox-server/Makefile.am
index 80fa5a4..f38f296 100644 (file)
--- a/src/client/sandbox-server/Makefile.am
+++ b/src/client/sandbox-server/Makefile.am
@@ -22,8 +22,8 @@ captive_sandbox_server_SOURCES= \
                main.c
 captive_sandbox_server_CFLAGS=$(ORBIT_CFLAGS) $(LINC_CFLAGS)
 captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(captive_library) $(INTLLIBS)
-sbin_PROGRAMS+=captive-sandbox-server
-sbinPROGRAMS_INSTALL=${INSTALL} -o root -g root -m 4755
+libexec_PROGRAMS=captive-sandbox-server
+libexecPROGRAMS_INSTALL=${INSTALL} -o root -g root -m 4755
 EXTRA_DIST+=.gdbinit
 
 install-data-hook: