X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2FMakefile;h=499d486623c026de2a79ab616c4011ef78748aaf;hp=ce07d8dd20aeccf4fe70668e2768b3c563e17b14;hb=a141b43506c20f6681e428c5c73f3c35adb8ea2d;hpb=82d4209792035676f1aea2cdaa38bbbf2bd43e04

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index ce07d8dd2..499d48662 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 = 80
+SHLIB_REV = 82
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -91,6 +91,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 "" >> $@
@@ -105,7 +107,11 @@ install: all
 	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
 	mkdir -p $(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
 .PHONY: install