X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fcdrom_id%2FMakefile;h=7cd7c1d74ae235d29aa4df16a58e264063c3a6fe;hb=9b23e594bf2533b7fadeea1680b186e4775cfe17;hp=c7479ed4ed54bfc06dafa7a1739547fd4eff14e5;hpb=15ff0ba36e9c1f051fe1e35e69f8569d0dfe2d66;p=elogind.git

diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index c7479ed4e..7cd7c1d74 100644
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -18,12 +18,12 @@ usrbindir =	${prefix}/usr/bin
 usrsbindir =	${prefix}/usr/sbin
 libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
-configdir =	${etcdir}/udev/
+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
@@ -49,16 +49,18 @@ clean:
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+	$(INSTALL_DATA) -D 60-cdrom_id.rules $(DESTDIR)$(configdir)/rules.d/60-cdrom_id.rules
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
+	- rm $(DESTDIR)$(configdir)/rules.d/60-cdrom_id.rules
 .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