From ec7c0926cc98fa3adb0d70bd82404b52b46d0da4 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Mon, 7 Oct 2013 11:40:13 +0100
Subject: Convert to polkit from usermode consolehelper for gaining root
 privileges

polkit is better integrated into various environments, both console and GUI
and offers better access rules and prevents the internal need to run
su which is prone to errors and doesn't offer an environment integrated
prompt to the user.

In this case the current package policy (in rpm spec) has been migrated
here and is as follows:

  drak3d requires authentication as the current user.

mga#11125
---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 832bfe1..397cc38 100644
--- a/Makefile
+++ b/Makefile
@@ -4,39 +4,41 @@ VERSION = 1.32
 DESTDIR=
 libdir=/usr/lib
 bindir=/usr/bin
-sbindir=/usr/sbin
+libexecdir=/usr/libexec
 desktopdir=/usr/share/applications
 autostartdir=/usr/share/autostart
 xinitdir=/etc/X11/xinit.d
 iconsdir=/usr/lib/libDrakX/icons
 pixmapsdir=/usr/share/libDrakX/pixmaps
 
-BIN_TOOLS= 
-SBIN_TOOLS=drak3d
+BIN_TOOLS= drak3d
 
 all:
 	(find lib -name '*.pm'; find bin -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
 	make -C po
+	make -C polkit/policy
 
 check:
 	@for p in `find lib -name *.pm`; do perl -cw -I$(libdir)/libDrakX $$p || exit 1; done
 	@for p in bin/*; do perl -cw $$p || exit 1; done
 
 install:
-	install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(desktopdir),$(autostartdir),$(xinitdir),$(iconsdir),$(pixmapsdir)}
+	install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(xinitdir),$(iconsdir),$(pixmapsdir)}
 	cp -a lib/* $(DESTDIR)$(libdir)/libDrakX/
 	(cd bin; \
-	  [[ -n "$(BIN_TOOLS)" ]] && install -m755 $(BIN_TOOLS) $(DESTDIR)$(bindir); \
-	  install -m755 $(SBIN_TOOLS) $(DESTDIR)$(sbindir); \
+	  install -m755 $(BIN_TOOLS) $(DESTDIR)$(libexecdir); \
+	  install -m755 ../polkit/wrappers/* $(DESTDIR)$(bindir); \
 	)
 	#install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir)
 	install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir)
 	#install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir)
 	#perl -pe 's/\s+--force//g' $(DESTDIR)$(desktopdir)/net_applet.desktop > $(DESTDIR)$(autostartdir)/net_applet.desktop
 	make -C po install
+	make -C polkit/policy install
 
 clean:
 	make -C po clean
+	make -C polkit/policy clean
 
 dist: dis 
 dis:
-- 
cgit v1.2.1