volume_id: bump version

[elogind.git] / extras / volume_id / lib / Makefile

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index b73172e37e5cf03ae36e1e062d709e1c672e4858..0b6c727b98f0b896d0083ea6ade5f96ca6b9d464 100644 (file)
--- 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 = 77
+SHLIB_REV = 84
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -63,15 +63,15 @@ all: libvolume_id.a $(SHLIB) libvolume_id.pc
 .PHONY: all
 .DEFAULT: all
 
+.SUFFIXES:
+
 %.o: %.c
        $(E) "  CC      " $@
        $(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-.shlib:
-       $(Q) mkdir .shlib
-
-.shlib/%.o: %.c .shlib
+.shlib/%.o: %.c
        $(E) "  CC      " $@
+       $(Q) mkdir -p $(dir $@)
        $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
 
 libvolume_id.a: $(HEADERS) $(OBJS)
@@ -81,9 +81,9 @@ libvolume_id.a: $(HEADERS) $(OBJS)
        $(E) "  RANLIB  " $@
        $(Q) $(RANLIB) $@
 
-$(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(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,8 +91,9 @@ $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
 
 libvolume_id.pc:
        $(E) "  GENPC   " $@
-       $(Q) echo "prefix=${prefix}" > $@
-       $(Q) echo "libdir=${libdir}" >> $@
+       $(Q) echo "prefix=${prefix}/usr" >> $@
+       $(Q) echo "exec_prefix=\$${prefix}" >> $@
+       $(Q) echo "libdir=${usrlibdir}" >> $@
        $(Q) echo "includedir=${includedir}" >> $@
        $(Q) echo "" >> $@
        $(Q) echo "Name: libvolume_id" >> $@
@@ -102,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: