--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontsupport/fontutils/FontUtils/group/bld.inf	Mon Aug 23 14:11:23 2010 +0100
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Bldmake component description file for the fontutils\FontUtils component
+*
+*/
+
+PRJ_EXPORTS
+
+// Export IBY files
+../../rom/FontUtils.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(FontUtils.iby)
+#ifndef FF_PRODUCT_FONTS
+../../rom/fonts_variant.iby                          CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(fonts_variant.iby)
+#endif
+
+PRJ_MMPFILES
+#ifndef TOOLS
+    FontUtils.mmp
+#endif
+// End of File

--- a/fontsupport/fontutils/group/bld.inf	Wed Aug 18 10:48:00 2010 +0300
+++ b/fontsupport/fontutils/group/bld.inf	Mon Aug 23 14:11:23 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,12 +16,6 @@
 */
 
 
-
-// BLD.INF
-//
-// Copyright (c) 1999 Symbian Ltd.  All rights reserved.
-//
-
 #include <platform_paths.hrh>
 
 PRJ_EXPORTS
@@ -126,12 +120,6 @@
 		
 
 
-// Export IBY files
-../rom/FontUtils.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(FontUtils.iby)
-#ifndef FF_PRODUCT_FONTS
-../rom/fonts_variant.iby                          CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(fonts_variant.iby)
-#endif
-
 ./removegtfiles.meta                             /epoc32/tools/makefile_templates/s60/removegtfiles.meta
 ./removegtfiles.flm                              /epoc32/tools/makefile_templates/s60/removegtfiles.flm
 
@@ -143,8 +131,6 @@
 
 PRJ_MMPFILES
 #ifndef TOOLS
-    ../FontUtils/group/FontUtils.mmp
-
     // Remove Symbian fonts
     #ifndef SBSV2
       gnumakefile removegtfiles.mk

--- a/fontsupport/group/bld.inf	Wed Aug 18 10:48:00 2010 +0300
+++ b/fontsupport/group/bld.inf	Mon Aug 23 14:11:23 2010 +0100
@@ -18,4 +18,4 @@
 #ifndef FF_PRODUCT_FONTS
 #include "../fontprovider/Group/bld.inf"
 #endif
-#include "../fontutils/group/bld.inf"
+#include "../fontutils/FontUtils/group/bld.inf"