X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2FMakefile;h=3c38d6171e65b913038cf2bd09ed1a763094cd17;hp=ead205682ac0502111657dfc8ca87edc95291b60;hb=7596a562988b45b62dcac6daac3663524cc8f930;hpb=1bed1db4994aae37f4a11e90dabcd8b4e3592686

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index ead205682..3c38d6171 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -14,9 +14,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-SCSI_ID_VERSION=0.2
+SCSI_ID_VERSION=0.9
 
 prefix =
+etcdir =        ${prefix}/etc
 sbindir =	${prefix}/sbin
 mandir =	${prefix}/usr/share/man
 
@@ -27,10 +28,10 @@ INSTALL_DATA  = ${INSTALL} -m 644
 # Note some of the variables used here are set when built under udev, and
 # otherwise might not be set.
 
-override CFLAGS+=-DSCSI_ID_VERSION=\"$(SCSI_ID_VERSION)\" $(DEBUG) -Wall
+CFLAGS+=-Wall -fno-builtin
 
 PROG=scsi_id
-SYSFS=-lsysfs
+LIBSYSFS=-lsysfs
 
 #
 # Built static and stripped when built with udev.
@@ -39,25 +40,41 @@ SYSFS=-lsysfs
 # LDFLAGS=$(STRIP)
 LD=$(CC)
 
-OBJS= scsi_id.o \
-	scsi_serial.o \
+OBJS=	scsi_id.o scsi_serial.o
 
 all:	$(PROG)
 
 # XXX use a compressed man page?
 
 install: all
-	$(INSTALL_PROGRAM) -D $(PROG) $(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 	$(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
+	@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
 	
 uninstall:
-	-rm $(sbindir)/$(PROG)
-	-rm $(mandir)/man8/scsi_id.8
+	-rm $(DESTDIR)$(sbindir)/$(PROG)
+	-rm $(DESTDIR)$(mandir)/man8/scsi_id.8
+	-rm $(DESTDIR)$(etcdir)/scsi_id.config
 
-$(OBJS): scsi_id.h scsi.h
+GEN_HEADER=scsi_id_version.h
+
+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\" >> $@
+$(OBJS): scsi_id.h scsi.h scsi_id_version.h
 
 clean:
-	rm -f $(PROG) $(OBJS)
+	rm -f $(PROG) $(OBJS) $(GEN_HEADER)
+
+spotless: clean
+
+.c.o:
+	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
 
 $(PROG):	$(OBJS)
-	$(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIBSYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+