X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2FMakefile;h=057594d5bf06803bea13357d964dd5d0e09b7ec6;hp=85f6ff6ca81e385e8a7acecd1cb2e0abebc0559b;hb=1aa1e24848903d11780db1ade355be73ad61a937;hpb=85701baede56edd4fba042f98550b8dec1a73127

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 85f6ff6ca..057594d5b 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -15,14 +15,13 @@ GEN_HEADERS = scsi_id_version.h
 MAN_PAGES = scsi_id.8
 
 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,7 +29,6 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 # be able to run without udev
-LIBSYSFS = -lsysfs
 CROSS =
 QUIET =
 CC = $(CROSS)gcc
@@ -48,8 +46,10 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
+endif
 
 scsi_id_version.h:
 	@echo "/* This file is auto-generated by the Makefile */" > $@
@@ -78,7 +78,7 @@ install-man:
 .PHONY: uninstall-man
 
 uninstall-man:
-	-rm -f $(mandir)/man8/scsi_id.8
+	-rm -f $(DESTDIR)$(mandir)/man8/scsi_id.8
 .PHONY: uninstall-man
 
 install-config: