hal: Branch 'master'

[Danny Kukawka]

 hald/linux/addons/Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 0e0c9da6f5957eceff3b372c554697d7abbf4804 (from 019898159cd064f33bce4082d26295f9e3e6a2ef)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 21 22:31:30 2006 +0200

    fixed make for hald/linux/addons
    
    Removed -I$(top_srcdir)/hald from INCLUDES in hald/linux/addons/Makefile.am
    to avoid include hald/linux/pmu.h instead of /usr/include/linux/pmu.h.
    
    Thanks to Kay for the fast help to identify the problem!

diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
index 65819f4..48226af 100644
--- a/hald/linux/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
-        -I$(top_srcdir) -I$(top_srcdir)/hald \
+        -I$(top_srcdir) \
         @GLIB_CFLAGS@ @DBUS_CFLAGS@
 
 if HALD_COMPILE_LINUX