83 lines
3.5 KiB
Diff
83 lines
3.5 KiB
Diff
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602664
|
|
Author: Josselin Mouette <joss@debian.org>
|
|
|
|
The libgtop_server2 binary is launched by the library itself, and has no use
|
|
being launched directly. Therefore, it should go in $(libexecdir) instead.
|
|
|
|
The patch also adds some missing $(DESTDIR) references in the installation
|
|
hooks.
|
|
|
|
Index: libgtop2/libgtop-sysdeps.m4
|
|
===================================================================
|
|
--- libgtop2.orig/libgtop-sysdeps.m4 2011-09-06 14:12:33.925874923 +0200
|
|
+++ libgtop2/libgtop-sysdeps.m4 2011-09-06 14:12:37.175874943 +0200
|
|
@@ -73,7 +73,7 @@
|
|
libgtop_sysdeps_dir=bsd
|
|
libgtop_use_machine_h=yes
|
|
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
|
|
@@ -87,27 +87,27 @@
|
|
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_use_machine_h=yes
|
|
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_use_machine_h=yes
|
|
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_use_machine_h=yes
|
|
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
|
|
Index: libgtop2/src/daemon/Makefile.am
|
|
===================================================================
|
|
--- libgtop2.orig/src/daemon/Makefile.am 2011-06-01 17:40:47.000000000 +0200
|
|
+++ libgtop2/src/daemon/Makefile.am 2011-09-06 14:12:37.175874943 +0200
|
|
@@ -28,7 +28,7 @@
|
|
suid_common =
|
|
endif
|
|
|
|
-bin_PROGRAMS = libgtop_daemon2 @server_programs@
|
|
+libexec_PROGRAMS = libgtop_daemon2 @server_programs@
|
|
|
|
EXTRA_PROGRAMS = libgtop_server2
|
|
|
|
Index: libgtop2/configure.in
|
|
===================================================================
|
|
--- libgtop2.orig/configure.in 2011-08-30 13:25:29.000000000 +0200
|
|
+++ libgtop2/configure.in 2011-09-06 14:12:37.175874943 +0200
|
|
@@ -290,8 +290,8 @@
|
|
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"
|
|
|