summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatmans@us.ibm.com <patmans@us.ibm.com>2004-10-15 18:42:53 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 22:02:45 -0700
commit125930b45492c315f03d4b7a685d129a67338245 (patch)
tree04c93f6768907d7c261bfd0c390bb1a8fdcfe538
parentf837727408d862f0f23fe46f617d2060f0bd3aed (diff)
[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.
-rw-r--r--Makefile15
-rw-r--r--extras/scsi_id/Makefile8
2 files changed, 9 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index fd46a93a41..890667be9d 100644
--- 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 6a73e33785..7ccc4c5118 100644
--- 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.
#