# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1283258719 -10800 # Node ID aafcc8eeb5a4e7d53f25af1f1a5c5df8f0a880da # Parent e5e3f539dd557933bafe6809f293b495c3d343d1 Revision: 201033 Kit: 201035 diff -r e5e3f539dd55 -r aafcc8eeb5a4 gfxconversion/group/bld.inf --- a/gfxconversion/group/bld.inf Thu Jul 15 19:16:20 2010 +0300 +++ b/gfxconversion/group/bld.inf Tue Aug 31 15:45:19 2010 +0300 @@ -18,6 +18,6 @@ ----------------------------------------------------------------------------- */ -#include "../bmconv_s60/group/bld.inf" +// Removed bmconv from builds #include "../bmconv_s60/group/bld.inf" #include "../mifconv/group/bld.inf" diff -r e5e3f539dd55 -r aafcc8eeb5a4 gfxconversion/mifconv/makefile_templates/config/export.mk --- a/gfxconversion/mifconv/makefile_templates/config/export.mk Thu Jul 15 19:16:20 2010 +0300 +++ b/gfxconversion/mifconv/makefile_templates/config/export.mk Tue Aug 31 15:45:19 2010 +0300 @@ -14,11 +14,11 @@ # Description: makefile_templates, actual build configuration export makefile # -MAKEFILE = /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/config/export.mk +MAKEFILE = $(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/config/export.mk $(call push,MAKEFILE_STACK,$(MAKEFILE)) -TEMPLATEMAKEFILES = /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/*.* /epoc32/tools/makefile_templates/s60/ +TEMPLATEMAKEFILES = $(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/*.* $(EPOCROOT)/epoc32/tools/makefile_templates/s60/ template_makefiles :: template_makefiles_config diff -r e5e3f539dd55 -r aafcc8eeb5a4 gfxconversion/mifconv/makefile_templates/makefile --- a/gfxconversion/mifconv/makefile_templates/makefile Thu Jul 15 19:16:20 2010 +0300 +++ b/gfxconversion/mifconv/makefile_templates/makefile Tue Aug 31 15:45:19 2010 +0300 @@ -15,7 +15,7 @@ # -MAKEFILE = /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile +MAKEFILE = $(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile # Place the first target as the default target which is executed from this level