summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-09-28 05:12:37 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-09-28 05:12:37 -0700
commitcbe457028ee5667489b0e63a5c5f338f464f7857 (patch)
tree593292a20168a7fca170217f667d4ace035125d4
parentc69552c211679f06d85a2a5bfbc9eade5c41cf6a (diff)
parent3f544ae2b499ef15f22f49f6dc138b88390df5dd (diff)
Merge http://gkernel.bkbits.net/net-drivers-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8d0e49ea731f..2d5e00a174fb 100644
--- a/Makefile
+++ b/Makefile
@@ -706,7 +706,7 @@ MRPROPER_FILES += \
include/asm \
.hdepend $(TOPDIR)/include/linux/modversions.h \
tags TAGS kernel.spec \
- .tmpversion
+ .tmp*
# directories removed with 'make mrproper'
MRPROPER_DIRS += \
@@ -732,8 +732,8 @@ mrproper: clean archmrproper
@find . $(RCS_FIND_IGNORE) \
\( -name .depend -o -name .\*.cmd \) \
-type f -print | xargs rm -f
- @rm -f $(MRPROPER_FILES)
@rm -rf $(MRPROPER_DIRS)
+ @rm -f $(MRPROPER_FILES)
@$(MAKE) -C scripts mrproper
@$(MAKE) -f Documentation/DocBook/Makefile mrproper