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 /libcrypt | |
| 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 'libcrypt')
| -rw-r--r-- | libcrypt/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libcrypt/Makefile b/libcrypt/Makefile index f745f1047..30b1e1d94 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -38,7 +38,7 @@ $(LIBCRYPT): ar-target ar-target: $(OBJS) $(AR) $(ARFLAGS) $(LIBCRYPT) $(OBJS) $(INSTALL) -d $(TOPDIR)lib - rm -f $(TOPDIR)lib/$(LIBCRYPT) + $(RM) $(TOPDIR)lib/$(LIBCRYPT) $(INSTALL) -m 644 $(LIBCRYPT) $(TOPDIR)lib $(OBJS): %.o : %.c @@ -53,11 +53,10 @@ shared: all --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ -L$(TOPDIR)/lib -lc; $(INSTALL) -d $(TOPDIR)lib - rm -f $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION) + $(RM) $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib; (cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED)); (cd $(TOPDIR)lib && ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION)); clean: - rm -f *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)* - + $(RM) *.[oa] *~ core $(LIBCRYPT_SHARED)* $(LIBCRYPT_SHARED_FULLNAME)* |