From 811ac7a07941f11e4e8acfcba9b75d50d009f798 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 12 Oct 2013 13:50:02 +0100
Subject: polkit: Tidy up polkit support

---
 Makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 239c8d25..d0cdbc5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 12.42
 NAME = drakconf
-SUBDIRS = po pixmaps polkit/policy #data
+SUBDIRS = po pixmaps polkit #data
 localedir = $(DESTDIR)/usr/share/locale
 mcc_dir = $(DESTDIR)/usr/share/mcc
 SYSCONFDIR = $(DESTDIR)/etc/sysconfig
@@ -18,14 +18,12 @@ drakconf:
 	cp -l control-center drakconf
 
 clean:
-	$(MAKE) -C po $@
-	$(MAKE) -C polkit/policy $@
 	rm -f *~ drakconf core .#*[0-9] core.* *.bak
-	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
+	for d in $(SUBDIRS); do ( make -C $$d $@ ) ; done
 
 install: all
 	$(MAKE) -C po $@
-	$(MAKE) -C polkit/policy $@
+	$(MAKE) -C polkit $@
 	find -name '*.p[lm]' -o -name control-center -o -name drakconf | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
 	install -d $(DESTDIR)/usr/{bin,sbin,libexec,share/icons}
 	install -d $(mcc_dir)/themes/default/
@@ -35,7 +33,6 @@ install: all
 	install -m755 menus_launcher.pl $(DESTDIR)/usr/sbin/
 	install -m755 print_launcher.pl $(DESTDIR)/usr/sbin/
 	install -m755 drakxconf $(DESTDIR)/usr/libexec/
-	install -m755 polkit/wrappers/drakxconf $(DESTDIR)/usr/bin
 	install -m755 drakconsole $(DESTDIR)/usr/sbin/
 	install -m755 mdkwebadmin.pl $(DESTDIR)/usr/bin/
 	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
-- 
cgit v1.2.1