9 files changed, 14 insertions, 21 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 16dfc6bc0..20ac49191 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -46,7 +46,6 @@ install:
 	# All the things handled by polkit
 	mv -f $(SBINDEST)/drak{auth,boot,clock,font,ups,xservices} $(LIBEXECDEST)
 	mv -f $(SBINDEST)/logdrake $(LIBEXECDEST)/draklog
-	install standalone/polkit/wrappers/* $(BINDEST)
 
 	install -m 644 *.pm $(LIBDEST)
 	for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done
diff --git a/perl-install/standalone/polkit/policy/Makefile b/perl-install/standalone/polkit/policy/Makefile
index 09ce27564..b6860a8ec 100644
--- a/perl-install/standalone/polkit/policy/Makefile
+++ b/perl-install/standalone/polkit/policy/Makefile
@@ -1,16 +1,24 @@
+BINDIR = /usr/bin
+LIBEXECDIR = /usr/libexec
+BINDEST = $(PREFIX)$(BINDIR)
 POLKITPOLICYDEST = $(PREFIX)/usr/share/polkit-1/actions
 
 POLICY_IN := $(wildcard *.policy.in)
 POLICY = $(POLICY_IN:.policy.in=.policy)
+WRAPPERS = $(patsubst org.mageia.%.policy,%,$(POLICY))
 
-all: $(POLICY)
+all: $(WRAPPERS) $(POLICY)
 
 clean:
-	rm -f $(POLICY)
+	rm -f  $(WRAPPERS) $(POLICY)
 
-install: all
-	install -d $(POLKITPOLICYDEST)
-	install -m644 $(POLICY) $(POLKITPOLICYDEST)
+%: org.mageia.%.policy.in
+	@echo -e "#!/bin/sh\n$(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@
 
-%.policy:   %.policy.in
+%.policy: %.policy.in
 	intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache
+
+install: all
+	install -d $(BINDEST) $(POLKITPOLICYDEST)
+	install -m755 $(WRAPPERS) $(BINDEST)
+	install -m644 $(POLICY) $(POLKITPOLICYDEST)
diff --git a/perl-install/standalone/polkit/wrappers/drakauth b/perl-install/standalone/polkit/wrappers/drakauth
deleted file mode 100755
index b6bcf029d..000000000
--- a/perl-install/standalone/polkit/wrappers/drakauth
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakauth $*
diff --git a/perl-install/standalone/polkit/wrappers/drakboot b/perl-install/standalone/polkit/wrappers/drakboot
deleted file mode 100755
index 477ed03af..000000000
--- a/perl-install/standalone/polkit/wrappers/drakboot
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakboot $*
diff --git a/perl-install/standalone/polkit/wrappers/drakclock b/perl-install/standalone/polkit/wrappers/drakclock
deleted file mode 100755
index 1c10aa7b3..000000000
--- a/perl-install/standalone/polkit/wrappers/drakclock
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakclock $*
diff --git a/perl-install/standalone/polkit/wrappers/drakfont b/perl-install/standalone/polkit/wrappers/drakfont
deleted file mode 100755
index 664865f0a..000000000
--- a/perl-install/standalone/polkit/wrappers/drakfont
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakfont $*
diff --git a/perl-install/standalone/polkit/wrappers/draklog b/perl-install/standalone/polkit/wrappers/draklog
deleted file mode 100755
index b552273dd..000000000
--- a/perl-install/standalone/polkit/wrappers/draklog
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/draklog $*
diff --git a/perl-install/standalone/polkit/wrappers/drakups b/perl-install/standalone/polkit/wrappers/drakups
deleted file mode 100755
index e2c892b64..000000000
--- a/perl-install/standalone/polkit/wrappers/drakups
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakups $*
diff --git a/perl-install/standalone/polkit/wrappers/drakxservices b/perl-install/standalone/polkit/wrappers/drakxservices
deleted file mode 100755
index f4bb18b41..000000000
--- a/perl-install/standalone/polkit/wrappers/drakxservices
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakxservices $*