X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2FMakefile;h=41b7ecb7af83b0283d2e645363c32b4c20b08908;hb=e18e6d79996edeeb07e122f3582a688c3ef4f6b9;hp=e3c3f5dab55d243ce90ecb5c8935c96ffff7e3d3;hpb=674e00f67c5dc4bd6e7c5aff21c11b36eb81cd75;p=elogind.git

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index e3c3f5dab..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 = 62
+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,6 +45,7 @@ OBJS=				\
 	romfs.o			\
 	sysv.o			\
 	minix.o			\
+	gfs.o			\
 	luks.o			\
 	ocfs.o			\
 	vxfs.o			\
@@ -99,8 +102,8 @@ 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)
+	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