diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 0968bd623..96f61ce73 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2012-01-16 Keith Marshall + + Correct misused 'rm -r' command in uninstall rules. + + * lib/Makefile.in lib/ddk/Makefile.in lib/directx/Makefile.in: + (uninstall-headers): Don't use 'rm -r' when removing individual files; + correct this typo, substituting 'rm -f' as appropriate. + 2012-01-16 Keith Marshall Generalise makefile references to subdirectories of lib. diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index 090e2a797..63a62e022 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -160,7 +160,7 @@ uninstall-libraries: $(need-DESTDIR-compatibility) uninstall-headers: $(need-DESTDIR-compatibility) for file in $(HEADERS); do \ - rm -r $(DESTDIR)${inst_includedir}/$$file; \ + rm -f $(DESTDIR)${inst_includedir}/$$file; \ done rmdir $(DESTDIR)${inst_includedir} diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in index 001cd24a7..4920b3f68 100644 --- a/winsup/w32api/lib/ddk/Makefile.in +++ b/winsup/w32api/lib/ddk/Makefile.in @@ -88,7 +88,7 @@ uninstall-libraries: $(need-DESTDIR-compatibility) uninstall-headers: $(need-DESTDIR-compatibility) for file in $(HEADERS); do \ - rm -r $(DESTDIR)${ddk_includedir}/$$file; \ + rm -f $(DESTDIR)${ddk_includedir}/$$file; \ done rmdir $(DESTDIR)${ddk_includedir} diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in index 2970c5b0b..35cc21547 100644 --- a/winsup/w32api/lib/directx/Makefile.in +++ b/winsup/w32api/lib/directx/Makefile.in @@ -114,7 +114,7 @@ uninstall-libraries: $(need-DESTDIR-compatibility) uninstall-headers: $(need-DESTDIR-compatibility) for file in $(HEADERS); do \ - rm -r $(DESTDIR)${inst_includedir}/$$file; \ + rm -f $(DESTDIR)${inst_includedir}/$$file; \ done rmdir $(DESTDIR)${inst_includedir}