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

diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 5ad2bcf3e..ead205682 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -14,33 +14,45 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-VERSION=0.1
+SCSI_ID_VERSION=0.2
 
 prefix =
 sbindir =	${prefix}/sbin
+mandir =	${prefix}/usr/share/man
 
 INSTALL  = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 
-CFLAGS=-DVERSION=\"$(VERSION)\" $(DEBUG) -Wall
+# 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
 
 PROG=scsi_id
+SYSFS=-lsysfs
 
-LIBSYSFS=-lsysfs
-STRIP=-s
-LDFLAGS=$(STRIP) --static
+#
+# Built static and stripped when built with udev.
+#
+# STRIP=-s
+# LDFLAGS=$(STRIP)
+LD=$(CC)
 
 OBJS= scsi_id.o \
 	scsi_serial.o \
 
 all:	$(PROG)
 
+# XXX use a compressed man page?
+
 install: all
 	$(INSTALL_PROGRAM) -D $(PROG) $(sbindir)/$(PROG)
+	$(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8
 	
 uninstall:
 	-rm $(sbindir)/$(PROG)
+	-rm $(mandir)/man8/scsi_id.8
 
 $(OBJS): scsi_id.h scsi.h
 
@@ -48,4 +60,4 @@ clean:
 	rm -f $(PROG) $(OBJS)
 
 $(PROG):	$(OBJS)
-	$(CC) $(OBJS) $(LDFLAGS) $(LIBSYSFS) -o $(PROG)
+	$(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)