Move polkit .policy file from policy/ to data/

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 9631f73..e23dd1c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 NULL =
 
-SUBDIRS = data udisks src tools policy po doc
+SUBDIRS = data udisks src tools po doc
 
 EXTRA_DIST =                   \
        HACKING                 \

diff --git a/configure.ac b/configure.ac
index fb28f7b..4356e18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,6 @@ doc/Makefile
 doc/version.xml
 doc/man/Makefile
 po/Makefile.in
-policy/Makefile
 ])
 
 dnl ==========================================================================

diff --git a/data/.gitignore b/data/.gitignore
index 04c140c..8d5ff8c 100644 (file)
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,4 +1,5 @@
 org.freedesktop.*.conf
 org.freedesktop.*.service
+org.freedesktop.*.policy
 *.pc
 

diff --git a/data/Makefile.am b/data/Makefile.am
index ee19da0..6998d2d 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,13 +28,20 @@ endif
 udevrulesdir = $(slashlibdir)/udev/rules.d
 udevrules_DATA = 80-udisks2.rules
 
+polkitdir        = $(datadir)/polkit-1/actions
+polkit_in_files  = org.freedesktop.udisks2.policy.in
+polkit_DATA      = $(polkit_in_files:.policy.in=.policy)
+
+@INTLTOOL_POLICY_RULE@
+
 EXTRA_DIST =                                           \
        80-udisks2.rules                                \
        org.freedesktop.UDisks2.xml                     \
        $(systemdservice_in_files)                      \
        $(dbusservice_in_files)                         \
        $(dbusconf_in_files)                            \
+       $(polkit_in_files)                              \
        $(NULL)
 
 clean-local :
-       rm -f *~ $(dbusservice_DATA) $(dbusconf_DATA) $(systemdservice_DATA)
+       rm -f *~ $(dbusservice_DATA) $(dbusconf_DATA) $(systemdservice_DATA) $(polkit_DATA)

diff --git a/policy/org.freedesktop.udisks2.policy.in b/data/org.freedesktop.udisks2.policy.in
similarity index 100%
rename from policy/org.freedesktop.udisks2.policy.in
rename to data/org.freedesktop.udisks2.policy.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 76fedde..1a4dff7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 [encoding: UTF-8]
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-policy/org.freedesktop.udisks2.policy.in
+data/org.freedesktop.udisks2.policy.in
 src/udiskslinuxblock.c
 src/udiskslinuxdrive.c
 src/udiskslinuxdriveata.c

diff --git a/policy/.gitignore b/policy/.gitignore
deleted file mode 100644 (file)
index 332849d..0000000
--- a/policy/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-org.freedesktop.udisks.policy
-

diff --git a/policy/Makefile.am b/policy/Makefile.am
deleted file mode 100644 (file)
index 7f8f160..0000000
--- a/policy/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-policydir = $(datadir)/polkit-1/actions
-dist_policy_DATA = org.freedesktop.udisks2.policy
-
-@INTLTOOL_POLICY_RULE@
-
-clean-local :
-       rm -f *~ *.policy
-
-DISTCLEANFILES = $(dist_policy_DATA)
-
-EXTRA_DIST = $(dist_policy_DATA:.policy=.policy.in)