hal: Branch 'master'

[David Zeuthen]

 doc/man/Makefile.am |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree a5861634bc0961d379c16fdafb4e1268ecbbd37b (from d3138a8f990e5d88c357d3a11841cc31aa40f6dd)
Author: Michael Biebl <mbiebl at gmail.com>
Date:   Thu May 3 13:42:48 2007 -0400

    install hal-is-caller-privileged.1 manpage conditionally
    
    Installing the hal-is-caller-privileged.1 manpage conditionally was
    not a bad idea, imo.  You could use the attached patch to achieve that
    again (even if it makes the Makefile.am a bit more inconsistent, as
    you have to specificy hal-is-caller-privileged at two places)

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index c90154a..0461259 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,13 +1,17 @@
 
-MAN_IN_FILES = hald.8.in lshal.1.in hal-get-property.1.in hal-set-property.1.in hal-find-by-property.1.in hal-find-by-capability.1.in hal-is-caller-locked-out.1.in hal-lock.1.in hal-disable-polling.1.in hal-is-caller-privileged.1.in
+MAN_IN_FILES = hald.8.in lshal.1.in hal-get-property.1.in hal-set-property.1.in hal-find-by-property.1.in hal-find-by-capability.1.in hal-is-caller-locked-out.1.in hal-lock.1.in hal-disable-polling.1.in
 
 if MAN_PAGES_ENABLED
 
 man_MANS = $(MAN_IN_FILES:.in=)
 
+if HAVE_POLKIT
+man_MANS += hal-is-caller-privileged.1
+endif
+
 endif # MAN_PAGES_ENABLED
 
-EXTRA_DIST=$(MAN_IN_FILES)
+EXTRA_DIST = $(MAN_IN_FILES) hal-is-caller-privileged.1.in
 
 clean-local:
 	rm -f *~ *.1 *.8