From cae1f59f7459a136cf52ae3a868b8733ef8c0e80 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 12 Oct 2013 15:20:51 +0100
Subject: Use polkit for authorisation (mga#11125)

---
 Makefile | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 001563be..77c72c4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,16 @@
 PACKAGE = mgaonline
 VERSION:=2.81
-SVNROOT = svn+ssh://svn.mageia.org/svn/soft/$(PACKAGE)
 
 NAME = mgaonline
 MGAUPDATE = mgaupdate
 MGAAPPLET = mgaapplet
-SUBDIRS = po
+SUBDIRS = po polkit
 
 PREFIX = /
 DATADIR = $(PREFIX)/usr/share
 ICONSDIR = $(DATADIR)/icons
 PIXDIR = $(DATADIR)/$(NAME)
-SBINDIR = $(PREFIX)/usr/sbin
+LIBEXECDIR = $(PREFIX)/usr/libexec
 BINDIR = $(PREFIX)/usr/bin
 FBLIBDIR = $(PREFIX)/usr/lib/libDrakX/drakfirsttime
 SYSCONFDIR = $(PREFIX)/etc/sysconfig
@@ -23,17 +22,17 @@ override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\"
 
 all:
 	(find -name .svn -prune -name '*.pm' -o -name mgaapplet\* -o -name mgaupdate -o -name mgaonline_agent.pl -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
-	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
+	for d in $(SUBDIRS); do ( make -C $$d $@ ) ; done
 
 clean:
 	$(MAKE) -C po $@
 	rm -f core .#*[0-9]
-	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
+	for d in $(SUBDIRS); do ( make -C $$d $@ ) ; done
 	find . -name '*~' | xargs rm -f
 
 install: all
-	install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
-	install -m755 $(MGAUPDATE) $(SBINDIR)
+	install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
+	install -m755 $(MGAUPDATE) $(MGAAPPLET)-config $(MGAAPPLET)-upgrade-helper $(LIBEXECDIR)
 	install -m755 $(MGAAPPLET) $(BINDIR)
 	install -d $(SYSCONFDIR)
 	install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet
@@ -50,15 +49,6 @@ install: all
 	install -m644 mgaonline.xml $(DATADIR)/mime/packages/mgaonline.xml
 	mkdir -p $(DATADIR)/mimelnk/application/
 	install -m644 x-mga-exec.desktop $(DATADIR)/mimelnk/application/
-	mkdir -p $(PREFIX)/etc/security/console.apps/
-	install -m644 console.apps_urpmi.update $(PREFIX)/etc/security/console.apps/urpmi.update
-	mkdir -p $(PREFIX)/etc/pam.d
-	install -m644 pam.d_urpmi.update $(PREFIX)/etc/pam.d/urpmi.update
-	ln -sf consolehelper $(PREFIX)/usr/bin/urpmi.update
-	for i in mgaapplet-config mgaapplet-upgrade-helper; do \
-		install -m755 $$i $(SBINDIR); \
-		ln -sf consolehelper $(PREFIX)/usr/bin/$$i; \
-	done
 
 cleandist:
 	rm -rf $(PACKAGE)-$(VERSION) ../$(PACKAGE)-$(VERSION).tar.bz2
-- 
cgit v1.2.1