summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-12-08 19:30:41 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 23:13:47 -0700
commit09f275607119e848be4888518a6a3fcd58a32c6d (patch)
treec6e85fd893a7c1bd67796234fc1a2bde4860d32d
parent6fbecf3547a02be2475f275d6862ed9dcfcce2fe (diff)
[PATCH] fix scsi_id build errors due to changes in the main udev makefile
also fixed up the QUIET issue when it was disabled for the extras programs
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 942c8ccb19..7d4396b9ed 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS)
LD="$(LD)" \
SYSFS="$(SYSFS)" \
KERNEL_DIR="$(KERNEL_DIR)" \
- QUIET="@$(PWD)/ccdv" \
+ QUIET="$(QUIET)" \
-C $$target $@ ; \
done ; \
@@ -231,6 +231,8 @@ OBJS = \
libsysfs/sysfs.a \
udev.a
+SYSFS = $(PWD)/libsysfs/sysfs.a
+
ifeq ($(strip $(USE_KLIBC)),true)
HEADERS += \
klibc_fixups/klibc_fixups.h \
@@ -244,7 +246,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
endif
ifeq ($(strip $(V)),false)
- QUIET=@./ccdv
+ QUIET=@$(PWD)/ccdv
HOST_PROGS=ccdv
else
QUIET=