Revert incorrect RCL_3 drop: RCL_3
authorPat Downey <patd@symbian.org>
Wed, 01 Sep 2010 12:20:07 +0100
branchRCL_3
changeset 13 fcf0948c1bce
parent 12 aafcc8eeb5a4
child 14 4b96f89bb6f3
Revert incorrect RCL_3 drop: Revision: 201033 Kit: 201035
gfxconversion/group/bld.inf
gfxconversion/mifconv/makefile_templates/config/export.mk
gfxconversion/mifconv/makefile_templates/makefile
--- a/gfxconversion/group/bld.inf	Tue Aug 31 15:45:19 2010 +0300
+++ b/gfxconversion/group/bld.inf	Wed Sep 01 12:20:07 2010 +0100
@@ -18,6 +18,6 @@
 -----------------------------------------------------------------------------
 */
 
-// Removed bmconv from builds #include "../bmconv_s60/group/bld.inf"
+#include "../bmconv_s60/group/bld.inf"
 #include "../mifconv/group/bld.inf"
 
--- a/gfxconversion/mifconv/makefile_templates/config/export.mk	Tue Aug 31 15:45:19 2010 +0300
+++ b/gfxconversion/mifconv/makefile_templates/config/export.mk	Wed Sep 01 12:20:07 2010 +0100
@@ -14,11 +14,11 @@
 # Description: makefile_templates, actual build configuration export makefile
 # 
  
-MAKEFILE =      $(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/config/export.mk
+MAKEFILE =      /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/config/export.mk
 $(call push,MAKEFILE_STACK,$(MAKEFILE)) 
 
  
-TEMPLATEMAKEFILES =	$(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/*.*			$(EPOCROOT)/epoc32/tools/makefile_templates/s60/
+TEMPLATEMAKEFILES =	/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/*.*			/epoc32/tools/makefile_templates/s60/
 
 template_makefiles :: template_makefiles_config
          
--- a/gfxconversion/mifconv/makefile_templates/makefile	Tue Aug 31 15:45:19 2010 +0300
+++ b/gfxconversion/mifconv/makefile_templates/makefile	Wed Sep 01 12:20:07 2010 +0100
@@ -15,7 +15,7 @@
 #
 
  
-MAKEFILE = $(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile
+MAKEFILE = /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile
 
  
 # Place the first target as the default target which is executed from this level