From 656bbdfde6d3d5f22d4e2fa29a13effdcd8747d2 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Mon, 30 Dec 2002 13:11:46 -0600
Subject: kbuild: Move archhelp to arch/$(ARCH)/Makefile

arch/$(ARCH)/Makefile already contains the kbuild required additions
to allow the kernel to be built for the architecture in question.
Moving archhelp centralise this information, and no longer require a
boot directory to exist to utilise this feature.

Update i386 to define archhelp in arch/$(ARCH)/Makefile
Other architectures will be updated in next cset.
---
 Makefile                | 3 ++-
 arch/i386/Makefile      | 9 +++++++++
 arch/i386/boot/Makefile | 8 --------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 3f39c51862a2..5f6cd42ec359 100644
--- a/Makefile
+++ b/Makefile
@@ -810,7 +810,8 @@ help:
 	@$(MAKE) --no-print-directory -f Documentation/DocBook/Makefile dochelp
 	@echo  ''
 	@echo  'Architecture specific targets ($(ARCH)):'
-	@$(MAKE) --no-print-directory -f arch/$(ARCH)/boot/Makefile archhelp
+	@$(if $(archhelp),$(archhelp),\
+		echo '  No architecture specific help defined for $(ARCH)')
 	@echo  ''
 	@echo  'Execute "make" or "make all" to build all targets marked with [*] '
 	@echo  'For further info browse Documentation/kbuild/*'
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 706e02cd4b9e..7069983f76a6 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -109,3 +109,12 @@ install: vmlinux
 
 archclean:
 	$(Q)$(MAKE) $(clean)=arch/i386/boot
+
+define archhelp
+  echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
+  echo  '  install	- Install kernel using'
+  echo  '		   (your) ~/bin/installkernel or'
+  echo  '		   (distribution) /sbin/installkernel or'
+  echo  '		   install to $$(INSTALL_PATH) and run lilo'
+endef
+
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index bcb97140c50f..701136c7581c 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -74,11 +74,3 @@ zlilo: $(BOOTIMAGE)
 
 install: $(BOOTIMAGE)
 	sh $(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
-
-archhelp:
-	@echo  '* bzImage	- Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
-	@echo  '  install	- Install kernel using'
-	@echo  '                  (your) ~/bin/installkernel or'
-	@echo  '                  (distribution) /sbin/installkernel or'
-	@echo  '        	  install to $$(INSTALL_PATH) and run lilo'
-
-- 
cgit v1.2.3