PolicyKit: Branch 'master'

[David Zeuthen]

 Makefile.am         |   22 +---------------------
 modules/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 22 deletions(-)

New commits:
diff-tree 0973db30eaab0e12d48b1e1f8386960fb32e2343 (from 3638c6c15eb33ec64559dc9f075c3f82f9cbcb66)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 8 02:13:34 2007 -0400

    stop disting ChangeLog and start disting modules/PolicyKit.conf
    
    Am happy to report that 'make distcheck' now works!

diff --git a/Makefile.am b/Makefile.am
index 9c313f1..3d285ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,29 +5,9 @@ SUBDIRS = libpolkit modules doc tools pr
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpolkit.pc
 
-# Creating ChangeLog from git log (taken from cairo/Makefile.am):
-
-ChangeLog: $(srcdir)/ChangeLog
-
-$(srcdir)/ChangeLog:
-	@if test -d "$(srcdir)/.git"; then \
-	  (cd "$(srcdir)" && \
-	  ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-.PHONY: ChangeLog $(srcdir)/ChangeLog
-
 DISTCLEANFILES = libpolkit.pc
 
-EXTRA_DIST = HACKING libpolkit.pc.in mkinstalldirs ChangeLog
+EXTRA_DIST = HACKING libpolkit.pc.in mkinstalldirs
 
 clean-local :
 	rm -f *~
diff --git a/modules/Makefile.am b/modules/Makefile.am
index c2d8d54..b8c1a0d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -2,4 +2,4 @@
 SUBDIRS = default allow-all deny-all
 
 polkitconfdir = $(sysconfdir)/PolicyKit
-polkitconf_DATA = PolicyKit.conf
+dist_polkitconf_DATA = PolicyKit.conf