X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2FMakefile;h=67006dcf52469f12a2b2e94e9520530dcb912c2d;hb=0c6ecdfd9f7b7247d8f0258b6cb92aac9eccfb9b;hp=b206854f55b49d4ef7b4d0f5f6953d3b756e39ae;hpb=01ac7d96fa65e83c71d5bba40633e813e9b4015b;p=elogind.git

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index b206854f5..67006dcf5 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -13,7 +13,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
-SHLIB_REV = 81
+SHLIB_REV = 84
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -52,6 +52,7 @@ OBJS=				\
 	vxfs.o			\
 	squashfs.o		\
 	netware.o		\
+	oracleasm.o		\
 	volume_id.o		\
 	util.o
 
@@ -83,7 +84,7 @@ libvolume_id.a: $(HEADERS) $(OBJS)
 
 $(SHLIB): $(HEADERS) exported_symbols $(addprefix .shlib/,$(OBJS))
 	$(E) "  CC      " $@
-	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
+	$(Q) $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ \
 		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
 		$(addprefix .shlib/,$(OBJS))
 	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
@@ -91,6 +92,8 @@ $(SHLIB): $(HEADERS) exported_symbols $(addprefix .shlib/,$(OBJS))
 
 libvolume_id.pc:
 	$(E) "  GENPC   " $@
+	$(Q) echo "prefix=${prefix}/usr" >> $@
+	$(Q) echo "exec_prefix=\$${prefix}" >> $@
 	$(Q) echo "libdir=${usrlibdir}" >> $@
 	$(Q) echo "includedir=${includedir}" >> $@
 	$(Q) echo "" >> $@
@@ -101,16 +104,19 @@ libvolume_id.pc:
 	$(Q) echo "Cflags: -I\$${includedir}" >> $@
 
 install: all
-	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-	mkdir -p $(DESTDIR)$(usrlibdir)/
+	$(INSTALL) -d $(DESTDIR)$(includedir)
+	$(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+	$(INSTALL) -d $(DESTDIR)$(libdir)
+	$(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+	$(INSTALL) -d $(DESTDIR)$(usrlibdir)
 	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
 ifeq ($(libdir),$(usrlibdir))
 	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 else
 	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 endif
-	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+	$(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
+	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install
 
 uninstall: