PolicyKit: Branch 'master'

[David Zeuthen]

 configure.in             |    4 ++--
 polkit-grant/Makefile.am |   11 -----------
 polkit/Makefile.am       |    6 ++++++
 3 files changed, 8 insertions(+), 13 deletions(-)

New commits:
diff-tree e54dc4407bbec6b76e48736cd1ba34d2c3c67028 (from a9860cf824a6503e09ea43070178676b39ca92f2)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Jul 25 14:11:36 2007 -0400

    change default username
    
    - change user from 'polkit' to 'polkituser'
    - create directories in /var from polkit instead of polkit-grant

diff --git a/configure.in b/configure.in
index fc33e68..1581fb7 100644
--- a/configure.in
+++ b/configure.in
@@ -181,7 +181,7 @@ dnl ------------------------------------
 
 AC_ARG_WITH(polkit_user,[  --with-polkit-user=<user>  user for PolicyKit])
 if test -z "$with_polkit_user" ; then
-    POLKIT_USER=polkit
+    POLKIT_USER=polkituser
 else
     POLKIT_USER=$with_polkit_user
 fi
@@ -190,7 +190,7 @@ AC_DEFINE_UNQUOTED(POLKIT_USER, "$POLKIT
 
 AC_ARG_WITH(polkit_group,[  --with-polkit-group=<grp>  group for PolicyKit])
 if test -z "$with_polkit_group" ; then
-    POLKIT_GROUP=polkit
+    POLKIT_GROUP=polkituser
 else
     POLKIT_GROUP=$with_polkit_group
 fi
diff --git a/polkit-grant/Makefile.am b/polkit-grant/Makefile.am
index 9dc626c..e7c848d 100644
--- a/polkit-grant/Makefile.am
+++ b/polkit-grant/Makefile.am
@@ -31,13 +31,6 @@ libexec_PROGRAMS = polkit-grant-helper
 polkit_grant_helper_SOURCES = polkit-grant-helper.c
 polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @AUTH_LIBS@ $(top_builddir)/polkit/libpolkit.la $(top_builddir)/polkit-dbus/libpolkit-dbus.la $(top_builddir)/polkit/libpolkit-grant-private.la
 
-polkit_grant_alwaysdir = $(localstatedir)/lib/PolicyKit
-dist_polkit_grant_always_DATA =
-
-polkit_grant_sessiondir = $(localstatedir)/run/PolicyKit
-dist_polkit_grant_session_DATA =
-
-
 clean-local :
 	rm -f *~ $(BUILT_SOURCES)
 
@@ -48,7 +41,3 @@ clean-local :
 install-data-local:
 	-chown :$(POLKIT_GROUP) $(DESTDIR)$(libexecdir)/polkit-grant-helper
 	-chmod 2755 $(DESTDIR)$(libexecdir)/polkit-grant-helper
-	-chown $(POLKIT_USER):$(POLKIT_GROUP) $(DESTDIR)$(localstatedir)/lib/PolicyKit
-	-chown $(POLKIT_USER):$(POLKIT_GROUP) $(DESTDIR)$(localstatedir)/run/PolicyKit
-	-chmod 775 $(DESTDIR)$(localstatedir)/lib/PolicyKit
-	-chmod 775 $(DESTDIR)$(localstatedir)/run/PolicyKit
diff --git a/polkit/Makefile.am b/polkit/Makefile.am
index d0bbd1f..3a2d144 100644
--- a/polkit/Makefile.am
+++ b/polkit/Makefile.am
@@ -66,6 +66,12 @@ clean-local :
 # Create /var/lib/PolicyKit/reload file; this is being watched by libpolkit
 # for config file changes.
 install-data-local:
+	-mkdir $(DESTDIR)$(localstatedir)/lib/PolicyKit
+	-mkdir $(DESTDIR)$(localstatedir)/run/PolicyKit
+	-chown $(POLKIT_USER):$(POLKIT_GROUP) $(DESTDIR)$(localstatedir)/lib/PolicyKit
+	-chown $(POLKIT_USER):$(POLKIT_GROUP) $(DESTDIR)$(localstatedir)/run/PolicyKit
+	-chmod 775 $(DESTDIR)$(localstatedir)/lib/PolicyKit
+	-chmod 775 $(DESTDIR)$(localstatedir)/run/PolicyKit
 	touch $(DESTDIR)$(localstatedir)/lib/PolicyKit/reload
 	-chmod 755 $(DESTDIR)$(localstatedir)/lib/PolicyKit/reload