X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=b72d5b11d98bc8ce5aa7e1cb54f1d2c3417b2b37;hb=467546b586e9ae29ac168967f5cdaac696cadcfb;hp=30c0abb9a4e683462f999eb5d219602286ac4e6a;hpb=f054627f500450a7aadeaf8a9930354fb268718e;p=elogind.git

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 30c0abb9a..b72d5b11d 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -11,14 +11,13 @@ GEN_HEADERS =
 MAN_PAGES =
 
 prefix =
-exec_prefix =	${prefix}
 etcdir =	${prefix}/etc
-sbindir =	${exec_prefix}/sbin
-usrbindir =	${exec_prefix}/usr/bin
-usrsbindir =	${exec_prefix}/usr/sbin
+sbindir =	${prefix}/sbin
+usrbindir =	${prefix}/usr/bin
+usrsbindir =	${prefix}/usr/sbin
+libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
-srcdir = .
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -30,25 +29,30 @@ all: $(PROG) $(MAN_PAGES)
 .DEFAULT: all
 
 %.o: %.c $(GEN_HEADERS)
-	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+	$(E) "  CC      " $@
+	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
 $(LIBVOLUME_ID):
-	$(MAKE) -C libvolume_id
+	$(Q) $(MAKE) -C libvolume_id
 
 $(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(E) "  LD      " $@
+	$(Q) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
-	$(QUIET) $(STRIPCMD) $@
+	$(E) "  STRIP   " $@
+	$(Q) $(STRIPCMD) $@
 endif
 
 # man pages
 %.8: %.xml
-	xmlto man $?
+	$(E) "  XMLTO   " $@
+	$(Q) xmlto man $?
 .PRECIOUS: %.8
 
 clean:
-	rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-	$(MAKE) -C libvolume_id clean
+	$(E) "  CLEAN   "
+	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+	$(Q) $(MAKE) -C libvolume_id clean
 .PHONY: clean
 
 install-bin: all