[PATCH] pass SYSFS setting down for extras builds

Modify SYSFS to specify the full path, and pass it down for the extras
builds.

Change the scsi_id Makefile so it will work with and without udev.

diff --git a/Makefile b/Makefile
index fd46a93a4135c482f24ae3184ad47835fbf8adf8..890667be9ddfe67be4b8e61712ab724653c77107 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -183,6 +183,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS)
                echo $$target ; \
                $(MAKE) prefix=$(prefix) \
                        LD="$(LD)" \
+                       SYSFS="$(SYSFS)" \
                        KERNEL_DIR="$(KERNEL_DIR)" \
                        -C $$target $@ ; \
        done ; \
@@ -198,13 +199,13 @@ $(CRT0):
 TDB =  tdb/tdb.o       \
        tdb/spinlock.o
 
-SYSFS =        libsysfs/sysfs_bus.o    \
-       libsysfs/sysfs_class.o  \
-       libsysfs/sysfs_device.o \
-       libsysfs/sysfs_dir.o    \
-       libsysfs/sysfs_driver.o \
-       libsysfs/sysfs_utils.o  \
-       libsysfs/dlist.o
+SYSFS =        $(PWD)/libsysfs/sysfs_bus.o     \
+       $(PWD)/libsysfs/sysfs_class.o   \
+       $(PWD)/libsysfs/sysfs_device.o  \
+       $(PWD)/libsysfs/sysfs_dir.o     \
+       $(PWD)/libsysfs/sysfs_driver.o  \
+       $(PWD)/libsysfs/sysfs_utils.o   \
+       $(PWD)/libsysfs/dlist.o
 
 OBJS = udev_lib.o      \
        udev_config.o   \

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 6a73e33785545ff0cfec30c4718b880fd0e5d345..7ccc4c51181f0471c388318093bdcc278a14e78c 100644 (file)
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -31,14 +31,8 @@ INSTALL_DATA  = ${INSTALL} -m 644
 override CFLAGS+=-Wall -fno-builtin
 
 PROG=scsi_id
+SYSFS=-lsysfs
 
-SYSFS =        ../../libsysfs/sysfs_bus.o      \
-       ../../libsysfs/sysfs_class.o    \
-       ../../libsysfs/sysfs_device.o   \
-       ../../libsysfs/sysfs_dir.o      \
-       ../../libsysfs/sysfs_driver.o   \
-       ../../libsysfs/sysfs_utils.o    \
-       ../../libsysfs/dlist.o
 #
 # Built static and stripped when built with udev.
 #