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=105549a946eedc3ffbdfb275832a6da86177d860;hb=7031a67c952ebc9c2b35735fb3e105f779e5701a;hpb=44d01dced113203c2c3eda7cb6e34ab8fb5c88d5;ds=sidebyside

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 105549a94..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 = 82
+SHLIB_REV = 84
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
@@ -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: