summaryrefslogtreecommitdiffstats
path: root/polkit
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-12 13:31:36 +0100
committerColin Guthrie <colin@mageia.org>2013-10-12 13:31:36 +0100
commitbdfcb6c5408cd41ccd10a838df70917b131a6aa4 (patch)
treed84ea86c300c48e049010b18f42cba3aa52b4d2a /polkit
parentf9ced290a6e6485513be1e489c855615d5802614 (diff)
downloaddrakx-kbd-mouse-x11-bdfcb6c5408cd41ccd10a838df70917b131a6aa4.tar
drakx-kbd-mouse-x11-bdfcb6c5408cd41ccd10a838df70917b131a6aa4.tar.gz
drakx-kbd-mouse-x11-bdfcb6c5408cd41ccd10a838df70917b131a6aa4.tar.bz2
drakx-kbd-mouse-x11-bdfcb6c5408cd41ccd10a838df70917b131a6aa4.tar.xz
drakx-kbd-mouse-x11-bdfcb6c5408cd41ccd10a838df70917b131a6aa4.zip
polkit: Tidy up polkit support
Diffstat (limited to 'polkit')
-rw-r--r--polkit/Makefile24
-rw-r--r--polkit/org.mageia.drakkeyboard.policy.in (renamed from polkit/policy/org.mageia.drakkeyboard.policy.in)0
-rw-r--r--polkit/org.mageia.drakmouse.policy.in (renamed from polkit/policy/org.mageia.drakmouse.policy.in)0
-rw-r--r--polkit/org.mageia.drakx11.policy.in (renamed from polkit/policy/org.mageia.drakx11.policy.in)0
-rw-r--r--polkit/policy/Makefile16
-rwxr-xr-xpolkit/wrappers/drakkeyboard2
-rwxr-xr-xpolkit/wrappers/drakmouse2
-rwxr-xr-xpolkit/wrappers/drakx112
8 files changed, 24 insertions, 22 deletions
diff --git a/polkit/Makefile b/polkit/Makefile
new file mode 100644
index 0000000..34e8106
--- /dev/null
+++ b/polkit/Makefile
@@ -0,0 +1,24 @@
+BINDIR = /usr/bin
+LIBEXECDIR = /usr/libexec
+BINDEST = $(DESTDIR)$(BINDIR)
+POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions
+
+POLICY_IN := $(wildcard *.policy.in)
+POLICY = $(POLICY_IN:.policy.in=.policy)
+WRAPPERS = $(patsubst org.mageia.%.policy,%,$(POLICY))
+
+all: $(WRAPPERS) $(POLICY)
+
+clean:
+ rm -f $(WRAPPERS) $(POLICY)
+
+%: org.mageia.%.policy.in
+ @echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@
+
+%.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/polkit/policy/org.mageia.drakkeyboard.policy.in b/polkit/org.mageia.drakkeyboard.policy.in
index 7ebaf2a..7ebaf2a 100644
--- a/polkit/policy/org.mageia.drakkeyboard.policy.in
+++ b/polkit/org.mageia.drakkeyboard.policy.in
diff --git a/polkit/policy/org.mageia.drakmouse.policy.in b/polkit/org.mageia.drakmouse.policy.in
index dc9981e..dc9981e 100644
--- a/polkit/policy/org.mageia.drakmouse.policy.in
+++ b/polkit/org.mageia.drakmouse.policy.in
diff --git a/polkit/policy/org.mageia.drakx11.policy.in b/polkit/org.mageia.drakx11.policy.in
index 5d1fad2..5d1fad2 100644
--- a/polkit/policy/org.mageia.drakx11.policy.in
+++ b/polkit/org.mageia.drakx11.policy.in
diff --git a/polkit/policy/Makefile b/polkit/policy/Makefile
deleted file mode 100644
index 1de7222..0000000
--- a/polkit/policy/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions
-
-POLICY_IN := $(wildcard *.policy.in)
-POLICY = $(POLICY_IN:.policy.in=.policy)
-
-all: $(POLICY)
-
-clean:
- rm -f $(POLICY)
-
-install: all
- install -d $(POLKITPOLICYDEST)
- install -m644 $(POLICY) $(POLKITPOLICYDEST)
-
-%.policy: %.policy.in
- intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache
diff --git a/polkit/wrappers/drakkeyboard b/polkit/wrappers/drakkeyboard
deleted file mode 100755
index f46e0ce..0000000
--- a/polkit/wrappers/drakkeyboard
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakkeyboard $*
diff --git a/polkit/wrappers/drakmouse b/polkit/wrappers/drakmouse
deleted file mode 100755
index 6d66e3a..0000000
--- a/polkit/wrappers/drakmouse
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakmouse $*
diff --git a/polkit/wrappers/drakx11 b/polkit/wrappers/drakx11
deleted file mode 100755
index 601654b..0000000
--- a/polkit/wrappers/drakx11
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakx11 $*