X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=80f9755d19bb9ee3f4303a4e6744d42476fea079;hp=72e2d3abb10fb930daa0fe015f1aed3f7bf9f1e8;hb=e18e6d79996edeeb07e122f3582a688c3ef4f6b9;hpb=c643d6183653ab908fbda48892357daa29dd5c52

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 72e2d3abb..80f9755d1 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -7,7 +7,7 @@
 
 PROG = vol_id
 GEN_HEADERS =
-MAN_PAGES =
+MAN_PAGES = vol_id.8
 
 prefix =
 etcdir =	${prefix}/etc
@@ -18,10 +18,10 @@ 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)
 .PHONY: all
@@ -41,10 +41,6 @@ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
 else
 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
 endif
-ifneq ($(strip $(STRIPCMD)),)
-	$(E) "  STRIP   " $@
-	$(Q) $(STRIPCMD) $@
-endif
 
 # man pages
 %.8: %.xml
@@ -59,18 +55,18 @@ clean:
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
 	$(MAKE) -C lib install
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
 	$(MAKE) -C lib uninstall
 .PHONY: uninstall-bin
 
 install-man:
 	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
+.PHONY: install-man
 
 uninstall-man:
 	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8