Makefile: fix uninstall target

"make uninstall" didn't uninstall all installed files. Fix it.

Signed-off-by: Martin Wilck <mwilck@suse.com>

diff --git a/Makefile b/Makefile
index fa114f31f4a38eca8350d4c333213039d6b50b79..8031ce24ff9ac6b778cfba9c1f3066909833029b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,15 @@ MON_SRCS = $(patsubst %.o,%.c,$(MON_OBJS))
 STATICSRC = pwgr.c
 STATICOBJS = pwgr.o
 
+UDEV_RULES = 01-md-raid-creating.rules 63-md-raid-arrays.rules 64-md-raid-assembly.rules \
+               69-md-clustered-confirm-device.rules
+SYSTEMD_UNITS = mdmon@.service mdmonitor.service mdadm-last-resort@.timer \
+               mdadm-last-resort@.service mdadm-grow-continue@.service \
+               mdcheck_start.timer mdcheck_start.service \
+               mdcheck_continue.timer mdcheck_continue.service \
+               mdmonitor-oneshot.timer mdmonitor-oneshot.service
+
+
 all : mdadm mdmon
 man : mdadm.man md.man mdadm.conf.man mdmon.man raid6check.man
 
@@ -288,8 +297,7 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
 
 install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid-creating.rules \
                udev-md-clustered-confirm-device.rules 
-       @for file in 01-md-raid-creating.rules 63-md-raid-arrays.rules 64-md-raid-assembly.rules \
-               69-md-clustered-confirm-device.rules ; \
+       @for file in $(UDEV_RULES); \
        do sed -e 's,BINDIR,$(BINDIR),g' udev-$${file#??-} > .install.tmp.1 && \
           $(ECHO) $(INSTALL) -D -m 644 udev-$${file#??-} $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \
           $(INSTALL) -D -m 644 .install.tmp.1 $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \
@@ -297,12 +305,7 @@ install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid
        done
 
 install-systemd: systemd/mdmon@.service
-       @for file in mdmon@.service mdmonitor.service mdadm-last-resort@.timer \
-               mdadm-last-resort@.service mdadm-grow-continue@.service \
-               mdcheck_start.timer mdcheck_start.service \
-               mdcheck_continue.timer mdcheck_continue.service \
-               mdmonitor-oneshot.timer mdmonitor-oneshot.service \
-               ; \
+       @for file in $(SYSTEMD_UNITS); \
        do sed -e 's,BINDIR,$(BINDIR),g;s,MISCDIR,$(MISCDIR),g' systemd/$$file > .install.tmp.2 && \
           $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
           $(INSTALL) -D -m 644 .install.tmp.2 $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
@@ -326,7 +329,12 @@ install-bin: mdadm mdmon
        $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
 
 uninstall:
-       rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
+       rm -f $(DESTDIR)$(BINDIR)/mdadm $(DESTDIR)$(BINDIR)/mdmon
+       rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+       rm -f $(UDEV_RULES:%=$(DESTDIR)$(UDEVDIR)/rules.d/%)
+       rm -f $(SYSTEMD_UNITS:%=$(DESTDIR)$(SYSTEMD_DIR)/%)
+       rm -f $(DESTDIR)$(SYSTEMD_DIR)-shutdown/mdadm.shutdown
+       rm -f $(DESTDIR)$(MISCDIR)/mdcheck
 
 test: mdadm mdmon test_stripe swap_super raid6check
        @echo "Please run './test' as root"