From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758954AbYHONqW (ORCPT ); Fri, 15 Aug 2008 09:46:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757378AbYHONqA (ORCPT ); Fri, 15 Aug 2008 09:46:00 -0400 Received: from ns.suse.de ([195.135.220.2]:42495 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757260AbYHONp7 (ORCPT ); Fri, 15 Aug 2008 09:45:59 -0400 Date: Fri, 15 Aug 2008 15:45:58 +0200 Message-ID: From: Takashi Iwai To: Sam Ravnborg Cc: Jeff Mahoney , Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: Fix creation of include2/asm symlink User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.2 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The directory include2/asm can point wrongly to a non-existing directory on architectures that have moved include/asm under arch/*. This patch fixes it by checking firstly whether arch/*/include/asm is available. Signed-off-by: Takashi Iwai --- diff --git a/Makefile b/Makefile index 53bf6ec..bcbb764 100644 --- a/Makefile +++ b/Makefile @@ -934,7 +934,11 @@ ifneq ($(KBUILD_SRC),) fi; $(Q)if [ ! -d include2 ]; then \ mkdir -p include2; \ - ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ + if [ -d $(srctree)/arch/$(SRCARCH)/include/asm ]; then \ + ln -fsn $(srctree)/arch/$(SRCARCH)/include/asm include2/asm; \ + else \ + ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ + fi; \ fi endif