scsi_id: add SGv4 support

[elogind.git] / extras / scsi_id / Makefile

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index b185998b1979e024626f20c74f7785b75bf99415..ca067d0cb904b2a60187e2c4c1b517b09be8e9c1 100644 (file)
--- 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
@@ -39,10 +39,6 @@ all: $(PROG) $(MAN_PAGES)
 $(PROG): %: $(HEADERS) %.o $(OBJS)
        $(E) "  LD      " $@
        $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(STRIPCMD),)
-       $(E) "  STRIP   " $@
-       $(Q) $(STRIPCMD) $@
-endif
 
 scsi_id_version.h:
        $(E) "  GENHDR  " $@
@@ -62,16 +58,18 @@ clean:
 .PHONY: clean
 
 install-bin: all
-       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: install-bin
 
 uninstall-bin:
-       - rm $(DESTDIR)$(sbindir)/$(PROG)
+       - rm $(DESTDIR)$(libudevdir)/$(PROG)
 .PHONY: uninstall-bin
 
 install-man:
-       $(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
-.PHONY: uninstall-man
+       $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL_DATA) scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
+.PHONY: install-man
 
 uninstall-man:
        -rm -f $(DESTDIR)$(mandir)/man8/scsi_id.8
@@ -79,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