hal/hald Makefile.am,1.51,1.52 hald.c,1.43,1.44

[Danny Kukawka]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv19007/hald

Modified Files:
	Makefile.am hald.c 
Log Message:
2005-11-29  Danny Kukawka  <danny.kukawka at web.de>

        * hald/Makefile.am, hald/hald.c: (main): Added PATH to the with
        hal distributed scripts to the hald environment PATH.

        * tools/Makefile.am: moved scripts to $(datadir)/hal/scripts to
        remove them from PATH of the root user, because they should only
        be called by hald and not by a user (at least because of
        missing environment variable , normaly set by hald)



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.am	12 Jul 2005 15:53:20 -0000	1.51
+++ Makefile.am	29 Nov 2005 17:57:19 -0000	1.52
@@ -9,6 +9,7 @@
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
+	-DPACKAGE_SCRIPT_DIR=\""$(datadir)/hal/scripts"\" \
 	-I$(top_srcdir) \
 	@PACKAGE_CFLAGS@
 

Index: hald.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- hald.c	2 Nov 2005 15:38:13 -0000	1.43
+++ hald.c	29 Nov 2005 17:57:19 -0000	1.44
@@ -427,6 +427,8 @@
 	if (path != NULL) {
 		g_strlcat (newpath, ":", sizeof (newpath));
 		g_strlcat (newpath, PACKAGE_LIBEXEC_DIR, sizeof (newpath));
+		g_strlcat (newpath, ":", sizeof (newpath));
+		g_strlcat (newpath, PACKAGE_SCRIPT_DIR, sizeof (newpath));
 	}
 	setenv ("PATH", newpath, TRUE);