From dd3fb0f8c1c10fcee804f11a4eed84316c5f694b Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 18 Oct 2003 10:20:59 +0000 Subject: 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). --- libutil/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libutil') diff --git a/libutil/Makefile b/libutil/Makefile index b149b0e64..572ca0aa8 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -42,7 +42,7 @@ $(LIBC): ar-target ar-target: $(OBJS) $(AR) $(ARFLAGS) $(LIBUTIL) $(OBJS) $(INSTALL) -d $(TOPDIR)lib - rm -f $(TOPDIR)lib/$(LIBUTIL) + $(RM) $(TOPDIR)lib/$(LIBUTIL) $(INSTALL) -m 644 $(LIBUTIL) $(TOPDIR)lib/ $(OBJS): %.o : %.c @@ -55,11 +55,10 @@ shared: all --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ -L$(TOPDIR)/lib -lc; $(INSTALL) -d $(TOPDIR)lib - rm -f $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION) + $(RM) $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib (cd $(TOPDIR)lib && ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED)); (cd $(TOPDIR)lib && ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED).$(MAJOR_VERSION)); clean: - rm -f *.[oa] *~ core $(LIBUTIL_SHARED)* $(LIBUTIL_SHARED_FULLNAME)* - + $(RM) *.[oa] *~ core $(LIBUTIL_SHARED)* $(LIBUTIL_SHARED_FULLNAME)* -- cgit v1.2.3