X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2FMakefile;h=1e9910efb9a887411171c2a3af30dfa355933eca;hp=bb3422a9c4f8e9c35e2d071008a78f75b079d174;hb=f7dd3a57a40282f1c3fb9ad90a30d58b31b64ff8;hpb=db28d2ea4f95aee82ec3619546546eb1506be46a

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index bb3422a9c..1e9910efb 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -15,64 +15,56 @@ 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}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-# be able to run without udev
-LIBSYSFS = -lsysfs
-CROSS =
-QUIET =
-CC = $(CROSS)gcc
-LD = $(CROSS)gcc
-AR = $(CROSS)ar
-STRIPCMD = $(CROSS)strip
-RANLIB = $(CROSS)ranlib
-HOSTCC = gcc
-CFLAGS += -Wall -pipe -fno-builtin -Wstrict-prototypes -Wsign-compare -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-LDFLAGS += -Wl
-
 all: $(PROG) $(MAN_PAGES)
 .PHONY: all
 .DEFAULT: all
 
 %.o: %.c $(GEN_HEADERS)
-	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+	$(E) "  CC      " $@
+	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
-	$(QUIET) $(STRIPCMD) $@
+	$(E) "  LD      " $@
+	$(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 
 scsi_id_version.h:
-	@echo "/* This file is auto-generated by the Makefile */" > $@
-	@echo \#define SCSI_ID_VERSION     \"$(SCSI_ID_VERSION)\" >> $@
-	@echo \#define SCSI_ID_CONFIG_FILE     \"$(etcdir)/scsi_id.config\" >> $@
+	$(E) "  GENHDR  " $@
+	$(Q) echo "/* Generated by make. */" > $@
+	$(Q) echo \#define SCSI_ID_VERSION     \"$(SCSI_ID_VERSION)\" >> $@
+	$(Q) echo \#define SCSI_ID_CONFIG_FILE     \"$(etcdir)/scsi_id.config\" >> $@
 
 # man pages
 %.8: %.xml
-	xmlto man $?
+	$(E) "  XMLTO   " $@
+	$(Q) xmlto man $?
 .PRECIOUS: %.8
 
 clean:
-	rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+	$(E) "  CLEAN   "
+	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+	ln -sf $(libudevdir)/$(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
+	- rm -f $(DESTDIR)$(sbindir)/$(PROG)
 .PHONY: uninstall-bin
 
 install-man:
@@ -80,14 +72,18 @@ 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:
-	@if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \
+	@ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \
 		echo $(INSTALL_DATA) -D ./scsi_id.config  $(DESTDIR)$(etcdir); \
 		$(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \
 	fi
 .PHONY: install-config
 
+install: all install-bin install-config install-man
+.PHONY: install
 
+uninstall: uninstall-bin uninstall-man
+.PHONY: uninstall