[PATCH] force udev to include the internal version of libsysfs and never the external...

Should fix some more build bugs...

diff --git a/namedev.c b/namedev.c
index 89513934ff4e483a49d60f621c973ddfd77d49f0..2f9d8f5f67b08892b55b86903a82edbd8ac00e22 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -32,8 +32,8 @@
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"

 #include "list.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "list.h"
 #include "udev.h"
 #include "udev_version.h"

diff --git a/udev-add.c b/udev-add.c
index 87cf57c3b662a5a786a1d8c8542552da24d58f21..736316629f9f9f2cba92782f070626743d41d195 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -33,8 +33,8 @@
 #ifndef __KLIBC__
 #include <pwd.h>
 #endif
 #ifndef __KLIBC__
 #include <pwd.h>
 #endif

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"

 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"

diff --git a/udev.c b/udev.c
index f3fab18b29e3fe000f214f38d0cfd0dfc8ee88fa..8c91ac62d4f303b40b4b59a8c4af0892ef76c9b1 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -26,8 +26,8 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"

 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "udev_dbus.h"

diff --git a/udev_config.c b/udev_config.c
index 1d05a3fb13cfb55a11b23e51968ccb6384955133..cade81cf207ccf3e1e9bbc454b8cce24a2629d9e 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -31,8 +31,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
 #include <ctype.h>

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"

 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"

diff --git a/udevdb.c b/udevdb.c
index bfd5b4bd697d47e0673d090c2e3494b876f950f7..f9fca4ab70abf66c7fab39788420ea04a400658d 100644 (file)
--- a/udevdb.c
+++ b/udevdb.c
@@ -32,8 +32,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <signal.h>

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"

 #include "udev_version.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_version.h"
 #include "udev.h"
 #include "logging.h"

diff --git a/udevinfo.c b/udevinfo.c
index 7991855b2812de55bec6567b27d9452f87ae36d0..b94376c9cee22131d7348f4f837982efc7bbe021 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -26,8 +26,9 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <errno.h>

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"
+#include "libsysfs/dlist.h"

 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"

diff --git a/udevtest.c b/udevtest.c
index 175f14326977256d37b053d9ee3190e3ff8c82fb..4956758636206343ba0139c6dec8d89da7d7beae 100644 (file)
--- a/udevtest.c
+++ b/udevtest.c
@@ -26,8 +26,8 @@
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>
 #include <errno.h>
 #include <ctype.h>
 #include <signal.h>

-#include <sysfs/libsysfs.h>

 
 

+#include "libsysfs/sysfs/libsysfs.h"

 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"