From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57786 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTLxI-0002CP-Dc for qemu-devel@nongnu.org; Thu, 16 Dec 2010 17:05:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTLxG-0002oM-G7 for qemu-devel@nongnu.org; Thu, 16 Dec 2010 17:05:44 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:53762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTLxG-0002nt-4J for qemu-devel@nongnu.org; Thu, 16 Dec 2010 17:05:42 -0500 From: Stefan Weil Date: Thu, 16 Dec 2010 22:52:05 +0100 Message-Id: <1292536325-12881-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] win32: Fix CRLF problem in make_device_config.sh List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers QEMU source code with CRLF line endings which is quite common on windows hosts fails with current make_device_config.sh. The awk script gets the name of the included file with \r, so instead of pci.mak it will search for pci.mak\r which of course does not work. Fix this by removing any \r at end of line. Signed-off-by: Stefan Weil --- make_device_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/make_device_config.sh b/make_device_config.sh index 8abadfe..f0ce10a 100644 --- a/make_device_config.sh +++ b/make_device_config.sh @@ -18,7 +18,7 @@ process_includes () { f=$src while [ -n "$f" ] ; do - f=`awk '/^include / {ORS=" " ; print "'$src_dir'/" $2}' $f` + f=`awk '/^include / {ORS=" "; sub(/\r$/, "", $2); print "'$src_dir'/" $2}' $f` [ $? = 0 ] || exit 1 all_includes="$all_includes $f" done -- 1.7.2.3