vol_id: do not fail if unable to drop privileges

[elogind.git] / extras / cdrom_id / Makefile

diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 59c2532d41c7ebeac1812b3934787dd9fb0325ff..7cd7c1d74ae235d29aa4df16a58e264063c3a6fe 100644 (file)
--- 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
@@ -36,10 +36,6 @@ all: $(PROG) $(MAN_PAGES)
 $(PROG): %: $(HEADERS) %.o $(OBJS)
        $(E) "  LD      " $@
        $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(strip $(STRIPCMD)),)
-       $(E) "  STRIP   " $@
-       $(Q) $(STRIPCMD) $@
-endif
 
 # man pages
 %.8: %.xml
@@ -53,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