diff options
| author | Josselin Mouette <joss@malsain.org> | 2016-01-29 11:37:37 +0100 |
|---|---|---|
| committer | Robert Roth <robert.roth.off@gmail.com> | 2022-03-28 05:23:42 +0000 |
| commit | 246ec92cab64db5d966f197aa910d647570798b2 (patch) | |
| tree | f302d2a064c30538bbe48680ce6ea84d68c2c707 | |
| parent | e68d20f739e6e3ea9ec601831f55d2b51fd81d85 (diff) | |
| download | libgtop-246ec92cab64db5d966f197aa910d647570798b2.tar.gz | |
daemon: Install to libexecdir, not bindir
https://bugzilla.gnome.org/show_bug.cgi?id=602664
https://gitlab.gnome.org/GNOME/libgtop/-/issues/17
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libgtop-sysdeps.m4 | 14 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index d31d9776..3ebd2103 100644 --- a/configure.ac +++ b/configure.ac @@ -295,8 +295,8 @@ libgtop_save_prefix="$prefix" libgtop_save_exec_prefix="$exec_prefix" test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=$prefix -LIBGTOP_BINDIR=`eval echo "${bindir}"` -LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"` +LIBGTOP_BINDIR=`eval echo "${libexecdir}"` +LIBGTOP_SERVER=`eval echo "${libexecdir}/libgtop_server2"` prefix="$libgtop_save_prefix" exec_prefix="$libgtop_save_exec_prefix" diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4 index b363dae0..f7a2405d 100644 --- a/libgtop-sysdeps.m4 +++ b/libgtop-sysdeps.m4 @@ -36,43 +36,43 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ libgtop_need_server=yes libgtop_sysdeps_private_mountlist=yes libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chown root $(bindir)/libgtop_server2 && chmod 4755 $(bindir)/libgtop_server2' + libgtop_postinstall='chown root $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 4755 $(DESTDIR)$(libexecdir)/libgtop_server2' ;; netbsd*|bsdi*) libgtop_sysdeps_dir=bsd libgtop_need_server=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2' + libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2' ;; openbsd*) libgtop_sysdeps_dir=openbsd libgtop_need_server=yes libgtop_sysdeps_private_mountlist=yes libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2' + libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2555 $(DESTDIR)$(libexecdir)/libgtop_server2' ;; freebsd*|kfreebsd*) libgtop_sysdeps_dir=freebsd libgtop_need_server=yes libgtop_sysdeps_private_mountlist=yes libgtop_sysdeps_private_fsusage=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2' + libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server2' ;; solaris*) libgtop_sysdeps_dir=solaris libgtop_need_server=yes - libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' + libgtop_postinstall='chgrp sys $(DESTDIR)$(libexecdir)/libgtop_server && chmod 2755 $(DESTDIR)$(libexecdir)/libgtop_server' ;; aix*) libgtop_sysdeps_dir=aix libgtop_need_server=yes libgtop_have_sysinfo=yes - libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2' + libgtop_postinstall='chgrp system $(DESTDIR)$(libexecdir)/libgtop_server && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2' ;; darwin*) libgtop_sysdeps_dir=darwin libgtop_need_server=yes libgtop_have_sysinfo=yes - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2' + libgtop_postinstall='chgrp kmem $(DESTDIR)$(libexecdir)/libgtop_server2 && chmod g+s $(DESTDIR)$(libexecdir)/libgtop_server2' ;; cygwin*) libgtop_sysdeps_dir=cygwin diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index f29d0a62..33d9a10d 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -26,7 +26,7 @@ suid_sysdeps = suid_common = endif -bin_PROGRAMS = libgtop_daemon2 @server_programs@ +libexec_PROGRAMS = libgtop_daemon2 @server_programs@ EXTRA_PROGRAMS = libgtop_server2 |