X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=extras%2Fvolume_id%2Flib%2FMakefile;h=41b7ecb7af83b0283d2e645363c32b4c20b08908;hb=07bc6002cac04de7dc80fae0287695f91b2c3f23;hp=a0c773550ed61b2311a34cbab5e327bab74d6f44;hpb=1fda06ae9891494b5890b287bd6db01b685a8be6;p=elogind.git

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index a0c773550..41b7ecb7a 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -8,12 +8,12 @@ includedir = 	${prefix}/usr/include
 libdir =	${prefix}/lib
 usrlibdir =	${prefix}/usr/lib
 
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
-SHLIB_REV = 61
+SHLIB_REV = 76
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -28,6 +28,8 @@ OBJS=				\
 	silicon_raid.o		\
 	nvidia_raid.o		\
 	promise_raid.o		\
+	adaptec_raid.o		\
+	jmicron_raid.o		\
 	iso9660.o		\
 	jfs.o			\
 	linux_raid.o		\
@@ -43,10 +45,12 @@ OBJS=				\
 	romfs.o			\
 	sysv.o			\
 	minix.o			\
+	gfs.o			\
 	luks.o			\
 	ocfs.o			\
 	vxfs.o			\
 	squashfs.o		\
+	netware.o		\
 	volume_id.o		\
 	util.o
 
@@ -98,10 +102,10 @@ libvolume_id.pc:
 
 install: all
 	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
 	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-	ln -sf $(DESTDIR)$(libdir)/$(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-	ln -sf $(DESTDIR)$(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+	mkdir -p $(DESTDIR)$(usrlibdir)/
+	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install