hal: Branch 'master'

[Richard Hughes]

 hald-runner/Makefile.am |    2 +-
 tools/Makefile.am       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 5c3da435c0e367266e9d7d5be28d72117bb77541 (from b30d1320614564d226018b8a491ee4f70567db64)
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Mon Aug 21 17:39:26 2006 +0100

    corrects the location of the hal scripts directory
    
    This corrects the location of the hal scripts directory passed by the
    preprocessor in the hald-runner and tools directories.

diff --git a/hald-runner/Makefile.am b/hald-runner/Makefile.am
index 280d48c..990fdc8 100644
--- a/hald-runner/Makefile.am
+++ b/hald-runner/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
-	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
+	-DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
 	-I$(top_srcdir) \
 	@DBUS_CFLAGS@ @GLIB_CFLAGS@
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bcfbf59..b64c2c0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
-	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
+	-DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
 	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@