vol_id: add --offset option

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

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 499d486623c026de2a79ab616c4011ef78748aaf..0e1565f98a3237a649ad67f289c524eb226bd356 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 = 82
+SHLIB_REV = 83
 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)
@@ -103,16 +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
 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: