Now install gparted wrapper script into $prefix/bin (#776437)

Now that the gparted script is intended to be run by ordinary users, as
well as root, install it into directory $prefix/bin rather than
$prefix/sbin.

Bug 776437 - GParted fails to run as root under Wayland
This commit is contained in:
Mike Fleetwood 2017-08-05 15:43:47 +01:00 committed by Curtis Gedak
parent a2cc5014c6
commit 778e21e94c
3 changed files with 7 additions and 6 deletions

View File

@ -20,10 +20,11 @@ APPDATA_FILES =$(APPDATA_IN_FILES:.xml.in=.xml)
appdatadir = $(datadir)/appdata appdatadir = $(datadir)/appdata
appdata_DATA = $(APPDATA_FILES) appdata_DATA = $(APPDATA_FILES)
sbin_SCRIPTS = gparted bin_SCRIPTS = gparted
CLEANFILES = $(sbin_SCRIPTS) $(DESKTOP_IN_FILES) CLEANFILES = $(bin_SCRIPTS) $(DESKTOP_IN_FILES)
do_subst = sed -e 's,[@]installdir[@],$(sbindir),g' \ do_subst = sed -e 's,[@]sbindir[@],$(sbindir),g' \
-e 's,[@]bindir[@],$(bindir),g' \
-e 's,[@]gksuprog[@],$(GKSUPROG),g' -e 's,[@]gksuprog[@],$(GKSUPROG),g'
gparted.desktop.in: gparted.desktop.in.in Makefile gparted.desktop.in: gparted.desktop.in.in Makefile

View File

@ -3,7 +3,7 @@ _Name=GParted
_GenericName=Partition Editor _GenericName=Partition Editor
_X-GNOME-FullName=GParted Partition Editor _X-GNOME-FullName=GParted Partition Editor
_Comment=Create, reorganize, and delete partitions _Comment=Create, reorganize, and delete partitions
Exec=@installdir@/gparted %f Exec=@bindir@/gparted %f
Icon=gparted Icon=gparted
Terminal=false Terminal=false
Type=Application Type=Application

View File

@ -39,7 +39,7 @@ fi
# #
# Define base command for executing GParted # Define base command for executing GParted
# #
BASE_CMD="@installdir@/gpartedbin $*" BASE_CMD="@sbindir@/gpartedbin $*"
# #
# For non-root users try to get authorisation to run GParted as root. # For non-root users try to get authorisation to run GParted as root.
@ -56,7 +56,7 @@ if test "x`id -u`" != "x0"; then
exit 1 exit 1
fi fi
@gksuprog@ '@installdir@/gparted' "$@" @gksuprog@ '@bindir@/gparted' "$@"
exit $? exit $?
fi fi