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

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index ce07d8dd2..0b6c727b9 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 = 84
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -83,7 +83,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 +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 "" >> $@
@@ -101,12 +103,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
-	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+endif
+	$(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
+	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install
 
 uninstall: