diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-10-18 10:20:59 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-10-18 10:20:59 +0000 |
commit | dd3fb0f8c1c10fcee804f11a4eed84316c5f694b (patch) | |
tree | 916c96c10d0178fa6f1c8d176f2c2d0bf72338b0 /libm | |
parent | 49f0dd0fcb64746b1ef06e094f2fa8091c23637c (diff) |
Peter Kjellerstedt writes:
rm.patch:
* Define $(RM) as rm -f in Rules.mak and test/Rules.mak
(this is the same definition as gmake uses by default).
* Change all occurrences of rm and rm -f into $(RM).
Diffstat (limited to 'libm')
-rw-r--r-- | libm/Makefile | 7 | ||||
-rw-r--r-- | libm/powerpc/Makefile | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libm/Makefile b/libm/Makefile index 200faf33e..e864f597e 100644 --- a/libm/Makefile +++ b/libm/Makefile @@ -89,7 +89,7 @@ $(LIBM): ar-target @if [ -f $(LIBM) ] ; then \ set -x -e; \ $(INSTALL) -d $(TOPDIR)lib; \ - rm -f $(TOPDIR)lib/$(LIBM); \ + $(RM) $(TOPDIR)lib/$(LIBM); \ $(INSTALL) -m 644 $(LIBM) $(TOPDIR)lib; \ fi; @@ -101,7 +101,7 @@ shared: all --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ -L$(TOPDIR)/lib -lc; \ $(INSTALL) -d $(TOPDIR)lib; \ - rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \ + $(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \ $(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \ (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \ (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \ @@ -120,7 +120,7 @@ tags: ctags -R clean: subdirs_clean - rm -f *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)* + $(RM) *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)* subdirs: $(patsubst %, _dir_%, $(DIRS)) subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) @@ -132,4 +132,3 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean .PHONY: dummy - diff --git a/libm/powerpc/Makefile b/libm/powerpc/Makefile index 10dacb07e..84e0b94c9 100644 --- a/libm/powerpc/Makefile +++ b/libm/powerpc/Makefile @@ -67,5 +67,5 @@ tags: ctags -R clean: - rm -f *.[oa] *~ core + $(RM) *.[oa] *~ core |