From 594d1272b9e12f8319204c3aa32705f3fb934456 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Mon, 18 Apr 2005 15:53:15 +0000
Subject: [PATCH] contrib.mk / linux-rpm.mk: Make clean targets sharper

  - Shift removal of everything into distclean target
  - Add support for CFG_CLEAN variable
---
 make/contrib.mk   | 14 ++++++--------
 make/linux-rpm.mk |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/make/contrib.mk b/make/contrib.mk
index d8f6bf5b..1ed3a663 100644
--- a/make/contrib.mk
+++ b/make/contrib.mk
@@ -20,6 +20,11 @@ ifndef CFG_INSTALL
 	make -C $(CFG_WORKING_DIR) install
 endif
 
+clean: $(CFG_CLEAN)
+ifndef CFG_CLEAN
+	if [ -d "$(CFG_WORKING_DIR)" ]; then make -C $(CFG_WORKING_DIR) clean; fi
+endif
+
 unpack.done:
 	tar -xzf $(CFG_PKG)
 	touch $@
@@ -35,15 +40,8 @@ apply-patches.done: unpack.done $(LOCAL_PATCH_DONE)
 	touch $@
 
 install:
-clean:
-	rm -rf *.done *.patch $(CFG_WORKING_DIR)
-
 distclean:
-test:
-	@echo CFG_WORKING_DIR=$(CFG_WORKING_DIR)
-	@echo CFG_PATCHES=$(CFG_PATCHES)
-	@echo LOCAL_PATCHES=$(LOCAL_PATCHES)
-	@echo $(filter %libmls1-sndfile.patch,$(CFG_PATCHES))
+	rm -rf *.done *.patch $(CFG_WORKING_DIR)
 
 unpack: unpack.done
 apply-patches: apply-patches.done
diff --git a/make/linux-rpm.mk b/make/linux-rpm.mk
index 8571c154..be3b5004 100644
--- a/make/linux-rpm.mk
+++ b/make/linux-rpm.mk
@@ -103,7 +103,8 @@ config-$(KERNEL_VERSION):
 	cvs commit
 
 toplevel-makefile: unpack.done
-	sed "s/\(^ *EXTRAVERSION *= *[^ 	]*\) *$$/\\1_$(KERNEL_RELEASE)/" linux-$(KERNEL_VERSION)/Makefile >$@
+	sed "s/\(^ *EXTRAVERSION *= *[^ 	]*\) *$$/\\1$(shell echo _$(KERNEL_RELEASE) | sed 's/^_/-/')/" \
+		linux-$(KERNEL_VERSION)/Makefile >$@
 
 linux-$(KERNEL_VERSION)/Makefile: toplevel-makefile
 	cp $< $@