summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-11 09:59:26 +0100
committerColin Guthrie <colin@mageia.org>2013-10-11 09:59:26 +0100
commit84942148c97222db0328dfed0fe3c7b047bb38b0 (patch)
tree5d3b2a9707b630e64a35e07c55dfcc9867e7aee8
parentacdd74d9e1994edab0902a51d353e799ea6097bd (diff)
downloaddrakx-84942148c97222db0328dfed0fe3c7b047bb38b0.tar
drakx-84942148c97222db0328dfed0fe3c7b047bb38b0.tar.gz
drakx-84942148c97222db0328dfed0fe3c7b047bb38b0.tar.bz2
drakx-84942148c97222db0328dfed0fe3c7b047bb38b0.tar.xz
drakx-84942148c97222db0328dfed0fe3c7b047bb38b0.zip
polkit: Shuffle around folders a bit
-rw-r--r--perl-install/Makefile.drakxtools2
-rw-r--r--perl-install/standalone/po/Makefile2
-rw-r--r--perl-install/standalone/polkit/Makefile (renamed from perl-install/standalone/polkit/policy/Makefile)2
-rw-r--r--perl-install/standalone/polkit/org.mageia.drakauth.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakauth.policy.in)0
-rw-r--r--perl-install/standalone/polkit/org.mageia.drakboot.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakboot.policy.in)0
-rw-r--r--perl-install/standalone/polkit/org.mageia.drakclock.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakclock.policy.in)0
-rw-r--r--perl-install/standalone/polkit/org.mageia.drakfont.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakfont.policy.in)0
-rw-r--r--perl-install/standalone/polkit/org.mageia.draklog.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.draklog.policy.in)0
-rw-r--r--perl-install/standalone/polkit/org.mageia.drakups.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakups.policy.in)0
-rw-r--r--perl-install/standalone/polkit/org.mageia.drakxservices.policy.in (renamed from perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy.in)0
10 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 20ac49191..6db0c3d97 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -4,7 +4,7 @@ include Makefile.config
.PHONY: install
INLIBDEST_DIRS = c resize_fat
-HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/menu standalone/polkit/policy
+HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/menu standalone/polkit
DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) harddrake ../tools/serial_probe
NAME = libDrakX
XSETUPLEVEL=40
diff --git a/perl-install/standalone/po/Makefile b/perl-install/standalone/po/Makefile
index 4bbf101cc..a76357686 100644
--- a/perl-install/standalone/po/Makefile
+++ b/perl-install/standalone/po/Makefile
@@ -40,7 +40,7 @@ install: $(MOFILES)
done
POTFILES.in:
- (cd .. ; /bin/ls -1 menu/*.desktop.in polkit/policy/*.policy.in; ) > POTFILES.in
+ (cd .. ; /bin/ls -1 menu/*.desktop.in polkit/*.policy.in; ) > POTFILES.in
clean:
diff --git a/perl-install/standalone/polkit/policy/Makefile b/perl-install/standalone/polkit/Makefile
index b6860a8ec..250afc2b0 100644
--- a/perl-install/standalone/polkit/policy/Makefile
+++ b/perl-install/standalone/polkit/Makefile
@@ -16,7 +16,7 @@ clean:
@echo -e "#!/bin/sh\n$(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@
%.policy: %.policy.in
- intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache
+ intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache
install: all
install -d $(BINDEST) $(POLKITPOLICYDEST)
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakauth.policy.in b/perl-install/standalone/polkit/org.mageia.drakauth.policy.in
index cfb2ba973..cfb2ba973 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakauth.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.drakauth.policy.in
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakboot.policy.in b/perl-install/standalone/polkit/org.mageia.drakboot.policy.in
index 8c1b81104..8c1b81104 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakboot.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.drakboot.policy.in
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakclock.policy.in b/perl-install/standalone/polkit/org.mageia.drakclock.policy.in
index ffb240242..ffb240242 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakclock.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.drakclock.policy.in
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakfont.policy.in b/perl-install/standalone/polkit/org.mageia.drakfont.policy.in
index ab5952d66..ab5952d66 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakfont.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.drakfont.policy.in
diff --git a/perl-install/standalone/polkit/policy/org.mageia.draklog.policy.in b/perl-install/standalone/polkit/org.mageia.draklog.policy.in
index 14af2ddcf..14af2ddcf 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.draklog.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.draklog.policy.in
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakups.policy.in b/perl-install/standalone/polkit/org.mageia.drakups.policy.in
index 31735098d..31735098d 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakups.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.drakups.policy.in
diff --git a/perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy.in b/perl-install/standalone/polkit/org.mageia.drakxservices.policy.in
index 9c4512a50..9c4512a50 100644
--- a/perl-install/standalone/polkit/policy/org.mageia.drakxservices.policy.in
+++ b/perl-install/standalone/polkit/org.mageia.drakxservices.policy.in