2008-01-08 Robert Millan <rmh@aybabtu.com>

        * Makefile.in (uninstall): Handle `$(update-grub_SCRIPTS)' and
        `$(update-grub_DATA)'.
        (distcheck): Fix race condition when invoking `$(MAKE)' on multiple
        targets.

diff --git a/ChangeLog b/ChangeLog
index 428dec50f99cb1b5bab91c774a070be97ce4cc68..0f9fe83ba7ed0149a1c73fa9fd7454dc1d713c85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-08  Robert Millan  <rmh@aybabtu.com>
+
+       * Makefile.in (uninstall): Handle `$(update-grub_SCRIPTS)' and
+       `$(update-grub_DATA)'.
+       (distcheck): Fix race condition when invoking `$(MAKE)' on multiple
+       targets.
+
 2008-01-07  Robert Millan  <rmh@aybabtu.com>
 
        * boot/i386/pc/boot.S (boot_drive_check): Add a comment indicating

diff --git a/Makefile.in b/Makefile.in
index c6a04c91e1e4bdab58127f94373bddf6d338df5a..84b4e9c7c0a61c2d816d491739cd9f847804848f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -219,6 +219,10 @@ uninstall:
          dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
          rm -f $(DESTDIR)$(sbindir)/$$dest; \
        done
+       @list='$(update-grub_SCRIPTS) $(update-grub_DATA)'; for file in $$list; do \
+         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
+         rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
+       done
 
 clean:
        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -271,11 +275,11 @@ distcheck: dist
        dc_instdir=`CDPATH=: && cd $(distdir)/=inst && pwd` \
          && cd $(distdir)/=build \
          && ../configure --srcdir=.. --prefix=$$dc_instdir \
-         && $(MAKE) all dvi check install uninstall \
+         && $(MAKE) all dvi check install && $(MAKE) uninstall \
          && (test `find $$dc_instdir -type f -print | wc -l` -le 1 \
             || (echo "Error: files left after uninstall" 1>&2; \
                 exit 1)) \
-         && $(MAKE) dist distclean \
+         && $(MAKE) dist && $(MAKE) distclean \
          && rm -f $(distdir).tar.gz \
          && (test `find . -type f -print | wc -l` -eq 0 \
             || (echo "Error: files left after distclean" 1>&2; \