# HG changeset patch # User Pat Downey # Date 1283340007 -3600 # Node ID fcf0948c1bcec3d7215b367f8e4f8367e746ddaf # Parent aafcc8eeb5a4e7d53f25af1f1a5c5df8f0a880da Revert incorrect RCL_3 drop: Revision: 201033 Kit: 201035 diff -r aafcc8eeb5a4 -r fcf0948c1bce gfxconversion/group/bld.inf --- 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" diff -r aafcc8eeb5a4 -r fcf0948c1bce gfxconversion/mifconv/makefile_templates/config/export.mk --- 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 diff -r aafcc8eeb5a4 -r fcf0948c1bce gfxconversion/mifconv/makefile_templates/makefile --- 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