hal: Branch 'master' - 2 commits

[Rob Taylor]

 hal.pc.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree fc4a4c730c6afdbee3ed2e23aec19fb039752c5f (from parents)
Merge: 0b512ad6c30f54aade6345f43211416a933c2378 c1bd8483392535d99df7de95f208a43f59c43cec
Author: Rob Taylor <robtaylor at floopily.org>
Date:   Tue Dec 19 18:45:47 2006 +0000

    Merge branch 'master' of ssh://git.freedesktop.org/git/hal

diff-tree 0b512ad6c30f54aade6345f43211416a933c2378 (from 0aa15edea346a236441cf8bc2a5e7e53f8da7398)
Author: Rob Taylor <robtaylor at floopily.org>
Date:   Tue Dec 19 18:41:40 2006 +0000

    Make haldaemon and haluser vaiables in hal.pc
    
    Makes haldaemon and haluser variables so users can read them using
    pkg-config (previously they were keywords, which are reserved for
    pkg-config extension)

diff --git a/hal.pc.in b/hal.pc.in
index 8e005e1..8af0ba7 100644
--- a/hal.pc.in
+++ b/hal.pc.in
@@ -2,6 +2,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+haluser=@HAL_USER@
+halgroup=@HAL_GROUP@
 
 Name: hal
 Description: Free desktop hardware abstraction layer
@@ -9,5 +11,3 @@ Version: @VERSION@
 Requires: dbus-1
 Libs: -L${libdir} -lhal
 Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/hal
-Haluser: @HAL_USER@
-Halgroup: @HAL_GROUP@