X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2FMakefile;h=ca067d0cb904b2a60187e2c4c1b517b09be8e9c1;hp=8ebe7026bbb38f6d47fb1be13aabc182d3deff71;hb=78d9ecfd4f1e37f7453e55e71f2909a58706ae10;hpb=c76b97dc4d10fb569fa0d599e30a40b54fad05e4

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 8ebe7026b..ca067d0cb 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -6,11 +6,11 @@
 # Released under the GNU General Public License, version 2.
 #
 
-SCSI_ID_VERSION = 0.9
+SCSI_ID_VERSION = 2.0
 
 PROG = scsi_id
 OBJS= scsi_serial.o
-HEADERS = scsi_id.h scsi.h scsi_id_version.h
+HEADERS = scsi_id.h scsi.h scsi_id_version.h bsg.h
 GEN_HEADERS = scsi_id_version.h
 MAN_PAGES = scsi_id.8
 
@@ -23,10 +23,10 @@ libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
 
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL_SCRIPT = ${INSTALL}
 
 all: $(PROG) $(MAN_PAGES)
 .PHONY: all
@@ -58,17 +58,17 @@ clean:
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
-	ln -sf $(libudevdir)/$(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL) -d $(DESTDIR)$(libudevdir)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
 	- rm $(DESTDIR)$(libudevdir)/$(PROG)
-	- rm -f $(DESTDIR)$(sbindir)/$(PROG)
 .PHONY: uninstall-bin
 
 install-man:
-	$(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
+	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+	$(INSTALL_DATA) scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
 .PHONY: install-man
 
 uninstall-man:
@@ -77,8 +77,10 @@ uninstall-man:
 
 install-config:
 	@ 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; \
+		echo $(INSTALL) -d $(DESTDIR)$(etcdir); \
+		echo $(INSTALL_DATA) ./scsi_id.config  $(DESTDIR)$(etcdir); \
+		$(INSTALL) -d $(DESTDIR)$(etcdir); \
+		$(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \
 	fi
 .PHONY: install-config