PolicyKit: Branch 'master'

[David Zeuthen]

 COPYING             |    2 +-
 data/Makefile.am    |    2 +-
 doc/man/Makefile.am |    2 +-
 polkit/Makefile.am  |    4 ++--
 tools/Makefile.am   |    5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)

New commits:
diff-tree 4a9a4e1829db0c88040db31b1e5287463ff268b3 (from e54dc4407bbec6b76e48736cd1ba34d2c3c67028)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Jul 25 15:00:57 2007 -0400

    fix typo

diff --git a/COPYING b/COPYING
index 2edfa2c..522d837 100644
--- a/COPYING
+++ b/COPYING
@@ -5,7 +5,7 @@ libpolkit is licensed to you under your 
 License version 2.1, or the GNU General Public License version 2.
 
 Both licenses are included here. Some individual source code files 
-and/or binaries may be under the GPL only or under the LGPG.
+and/or binaries may be under the GPL only or under the LGPL.
 
 Each source code file is marked with the proper copyright information.
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 8ff233c..14cbe48 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,7 +14,7 @@ dtd_DATA = config.dtd
 
 DISTCLEANFILES = polkit.pc polkit-dbus.pc polkit-grant.pc PolicyKit.conf
 
-EXTRA_DIST = polkit.in polkit.pc.in polkit-dbus.pc.in polkit-grant.pc.in PolicyKit.conf.in
+EXTRA_DIST = polkit.in polkit.pc.in polkit-dbus.pc.in polkit-grant.pc.in PolicyKit.conf.in config.dtd
 
 clean-local :
 	rm -f *~
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 9d4405e..5938601 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -10,7 +10,7 @@ endif # MAN_PAGES_ENABLED
 EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES)
 
 clean-local:
-	rm -f *~ *.1 *.8
+	rm -f *~ *.1 *.5 *.8
 
 %: %.in Makefile
 	$(edit) $< >$@
diff --git a/polkit/Makefile.am b/polkit/Makefile.am
index 3a2d144..78ebec6 100644
--- a/polkit/Makefile.am
+++ b/polkit/Makefile.am
@@ -66,8 +66,8 @@ 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
+	-mkdir -p $(DESTDIR)$(localstatedir)/lib/PolicyKit
+	-mkdir -p $(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
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1f5de08..0a71131 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -33,6 +33,8 @@ polkit_list_actions_LDADD = $(GLIB) $(to
 polkit-reload-config: polkit-reload-config.in Makefile
 	$(edit) $< >$@
 
+EXTRA_DIST = polkit-reload-config.in
+
 edit = sed \
 	-e 's|@docdir[@]|$(docdir)|g' \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
@@ -41,5 +43,4 @@ edit = sed \
 	-e 's|@localstatedir[@]|$(localstatedir)|g'
 
 clean-local :
-	rm -f *~
-
+	rm -f *~ polkit-reload-config