diff options
| author | Keith Marshall <keithmarshall@@users.sf.net> | 2012-01-17 00:37:25 +0400 |
|---|---|---|
| committer | Keith Marshall <keithmarshall@@users.sf.net> | 2012-01-17 00:37:25 +0400 |
| commit | d409f31ff34136f1b816526bc971136c7f7a74d0 (patch) | |
| tree | 48dc120859dcd062ccbdee9919e04da7fe95f4d0 /winsup | |
| parent | ec54dd65e2fc551a1549a081ef86c0d5f96528b0 (diff) | |
Correct misused 'rm -r' command in uninstall rules.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 2 | ||||
| -rw-r--r-- | winsup/w32api/lib/ddk/Makefile.in | 2 | ||||
| -rw-r--r-- | winsup/w32api/lib/directx/Makefile.in | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 0968bd623..96f61ce73 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,13 @@ 2012-01-16 Keith Marshall <keithmarshall@users.sf.net> + 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 <keithmarshall@users.sf.net> + Generalise makefile references to subdirectories of lib. * lib/Makefile.in (ddk, directx): Replace explicit references using... 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} |