Sophie

Sophie

distrib > Mandriva > 2007.0 > x86_64 > media > main-testing-src > by-pkgid > 6420fb1965140a49881a9e5d13f8d582 > files > 8

udev-098-7mdv2007.0.src.rpm

diff -urNp -x test udev-089.x86_64/Makefile udev-089/Makefile
--- udev-089.x86_64/Makefile	2006-04-03 14:41:10.000000000 +0200
+++ udev-089/Makefile	2006-04-22 11:41:03.000000000 +0200
@@ -117,7 +117,7 @@ LD = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 RANLIB = $(CROSS_COMPILE)ranlib
 
-CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS		= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_libudevdir=\"${libudevdir}\"
 WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
diff -urNp -x test udev-089.x86_64/udev_rules_parse.c udev-089/udev_rules_parse.c
--- udev-089.x86_64/udev_rules_parse.c	2006-04-03 14:41:10.000000000 +0200
+++ udev-089/udev_rules_parse.c	2006-04-22 11:41:09.000000000 +0200
@@ -369,7 +369,7 @@ static int add_to_rules(struct udev_rule
 
 				/* allow programs in /lib/udev called without the path */
 				if (strchr(file, '/') == NULL) {
-					strlcpy(file, "/lib/udev/", sizeof(file));
+					strlcpy(file, _libudevdir "/", sizeof(file));
 					strlcat(file, value, sizeof(file));
 					pos = strchr(file, ' ');
 					if (pos)
diff -urNp -x test udev-089.x86_64/udev_utils_run.c udev-089/udev_utils_run.c
--- udev-089.x86_64/udev_utils_run.c	2006-04-03 14:41:10.000000000 +0200
+++ udev-089/udev_utils_run.c	2006-04-22 11:41:17.000000000 +0200
@@ -126,7 +126,7 @@ int run_program(const char *command, con
 
 	/* allow programs in /lib/udev called without the path */
 	if (strchr(argv[0], '/') == NULL) {
-		strlcpy(program, "/lib/udev/", sizeof(program));
+		strlcpy(program, _libudevdir "/", sizeof(program));
 		strlcat(program, argv[0], sizeof(program));
 		argv[0] = program;
 	}