From patchwork Wed May 25 17:20:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1619 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:53:36 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.230 with SMTP id dz6cs240599vdc; Wed, 25 May 2011 10:20:57 -0700 (PDT) Received: by 10.227.37.14 with SMTP id v14mr4966738wbd.25.1306344056689; Wed, 25 May 2011 10:20:56 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id ep1si1643964wbb.127.2011.05.25.10.20.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 May 2011 10:20:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QPHlO-0000Pm-0W; Wed, 25 May 2011 18:20:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Stefan Hajnoczi Subject: [PATCH] configure: Don't create symlinks to nonexistent targets Date: Wed, 25 May 2011 18:20:54 +0100 Message-Id: <1306344054-1571-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 When we create the symlinks to source tree files, don't create them if the file is not actually present in the source tree; this will happen if the file is in a git submodule that wasn't checked out. This also avoids the odd effect where an in-source-tree configure will end up creating the missing file as a symlink to itself. Signed-off-by: Peter Maydell --- configure | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure b/configure index a318d37..e4d29d9 100755 --- a/configure +++ b/configure @@ -3564,7 +3564,10 @@ for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.rom $source_p done mkdir -p $DIRS for f in $FILES ; do - test -e $f || symlink $source_path/$f $f + if [ -e "$source_path/$f" -a ! -e "$f" ]; then + echo "symlinking $source_path/$f $f" + symlink "$source_path/$f" "$f" + fi done # temporary config to build submodules