X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=50d5e338c2cc36e23b6093f306bd450a62fc90e7;hb=c70560feef0eb61a150cd2f956f0beead4313ffe;hp=0b22fb9c2df5080f7c66a762570eb31eb71bc718;hpb=cee5700cde26053bcf26c61fc2b9aa8f98d27acd;p=elogind.git

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 0b22fb9c2..50d5e338c 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -18,21 +18,26 @@ libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
 
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL_SCRIPT = ${INSTALL}
 
-all: $(PROG) $(MAN_PAGES)
+all: lib $(PROG) $(MAN_PAGES)
 .PHONY: all
 .DEFAULT: all
 
+.SUFFIXES:
+
 %.o: %.c $(GEN_HEADERS)
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-lib/libvolume_id.a:
-	$(Q) $(MAKE) -C lib
+lib:
+	$(Q) $(MAKE) -C $@
+.PHONY: lib
+
+lib/libvolume_id.a: lib
 
 $(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
 	$(E) "  LD      " $@
@@ -55,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
 
@@ -65,8 +71,9 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
+	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
+	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+.PHONY: install-man
 
 uninstall-man:
 	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8