summaryrefslogtreecommitdiff
path: root/extras/volume_id
diff options
context:
space:
mode:
Diffstat (limited to 'extras/volume_id')
-rw-r--r--extras/volume_id/Makefile6
-rw-r--r--extras/volume_id/lib/Makefile11
2 files changed, 11 insertions, 6 deletions
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 6e5006594a..50d5e338c2 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -60,7 +60,8 @@ clean:
.PHONY: clean
install-bin: all
- $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+ $(INSTALL) -d $(DESTDIR)$(libudevdir)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
$(MAKE) -C lib install
.PHONY: install-bin
@@ -70,7 +71,8 @@ uninstall-bin:
.PHONY: uninstall-bin
install-man:
- $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+ $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
.PHONY: install-man
uninstall-man:
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index 105549a946..c0905f4a06 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -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: