From 0f757ee21ac08959b3c6685cf41f7f97cb101e56 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 23 May 2006 03:23:31 +0000
Subject: [PATCH] edje_decc works properly with default theme (as long as u
 rememeber to pass -DE17_PROFILE=SLOW_PC" so #defines get fixed

SVN revision: 22847
---
 legacy/edje/src/bin/edje_cc_sources.c | 10 +++++++---
 legacy/edje/src/bin/edje_decc.c       |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c
index 40253f0..446cb3c 100644
--- a/legacy/edje/src/bin/edje_cc_sources.c
+++ b/legacy/edje/src/bin/edje_cc_sources.c
@@ -90,7 +90,7 @@ source_fetch_file(char *fil, char *filname)
 	int got_hash = 0;
 	int forgetit = 0;
 	int haveinclude = 0;
-	char *file = NULL;
+	char *file = NULL, *fname = NULL;
 	
 	while ((!forgetit) && (*p))
 	  {
@@ -171,6 +171,9 @@ source_fetch_file(char *fil, char *filname)
 				 else
 				   snprintf(file, l, "%s/%s", dir, p + 1);
 
+				 fname = strdup(p + 1);
+				 pp = strrchr(fname, end);
+				 if (pp) *pp = 0;
 				 forgetit = 1;
 			      }
 			 }
@@ -183,10 +186,11 @@ source_fetch_file(char *fil, char *filname)
 
 	     got_hash = 0;
 	  }
-	if (file)
+	if ((file) && (fname))
 	  {
-	     source_fetch_file(file, file);
+	     source_fetch_file(file, fname);
 	     free(file);
+	     free(fname);
 	  }
      }
    free (dir);
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index 993cb8d..f9fd754 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -283,7 +283,7 @@ output(void)
 	  }
 	f = fopen(out, "w");
 	fprintf(f, "#!/bin/sh\n");
-	fprintf(f, "%s $@ --image_dir . --font_dir . %s -o %s.edj\n", edje_file->compiler, sf->name, outdir);
+	fprintf(f, "%s $@ -id . -fd . %s -o %s.edj\n", edje_file->compiler, sf->name, outdir);
 	fclose(f);
 
 #ifndef WIN32
-- 
2.7.4