diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index 824a5d5b06..e4301858c4 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -24,45 +24,45 @@ AC_CHECK_HEADERS(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your
 
 AC_CHECK_FUNCS(fnmatch, res=yes, res=no)
 if test "x$res" = "xno"; then
-	AC_CHECK_LIB(fnmatch, fnmatch, res=yes, res=no)
-	if test "x$res" = "xno"; then
-		AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch])
-	else
-		fnmatch_libs="-lfnmatch"
-	fi
+  AC_CHECK_LIB(fnmatch, fnmatch, res=yes, res=no)
+  if test "x$res" = "xno"; then
+    AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor libfnmatch])
+  else
+    fnmatch_libs="-lfnmatch"
+  fi
 fi
 
 AC_SUBST(fnmatch_libs)
-							
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
-fi
 
-dnl Set PACKAGE_BIN_DIR in config.h.
 if test "x${bindir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation directory for user executables])
+    PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation directory for user executables])
+    PACKAGE_BIN_DIR="${prefix}/bin"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user executables])
+  PACKAGE_BIN_DIR="${bindir}"
 fi
+AC_SUBST(PACKAGE_BIN_DIR)
 
-dnl Set PACKAGE_LIB_DIR in config.h.
 if test "x${libdir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation directory for libraries])
+    PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for libraries])
+    PACKAGE_LIB_DIR="${prefix}/lib"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries])
+  PACKAGE_LIB_DIR="${libdir}"
 fi
-
+AC_SUBST(PACKAGE_LIB_DIR)
+		
+if test "x${prefix}" = "xNONE"; then
+  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+else
+  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+fi
+AC_SUBST(PACKAGE_DATA_DIR)
+	
 AC_MSG_CHECKING(whether to build edje_cc)
 have_edje_cc="yes"
 AC_ARG_ENABLE(edje-cc, [  --disable-edje-cc       disable building of edje_cc ], [
diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am
index b0258213c9..b0d64e320d 100644
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@@ -7,8 +7,11 @@ INCLUDES = \
 @EET_CFLAGS@ \
 @EVAS_CFLAGS@ \
 @ECORE_CFLAGS@ \
-@EMBRYO_CFLAGS@
-
+@EMBRYO_CFLAGS@ \
+-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" 
+		      
 bin_SCRIPTS = \
 @EDJE_RECC_PRG@
 
diff --git a/legacy/edje/src/bin/edje_prefix.c b/legacy/edje/src/bin/edje_prefix.c
index 176eb23916..00d990d513 100644
--- a/legacy/edje/src/bin/edje_prefix.c
+++ b/legacy/edje/src/bin/edje_prefix.c
@@ -296,7 +296,7 @@ _e_prefix_fallbacks(void)
    _prefix_path_lib    = strdup(PACKAGE_LIB_DIR);
    printf("WARNING: Edje could not determine its installed prefix\n"
 	  "         and is falling back on the compiled in default:\n"
-	  "           %s\n", 
+	  "           %s\n"
 	  "         You might like to try setting the following environment variables:\n"
 	  "           E_PREFIX     - points to the base prefix of install\n"
 	  "           E_BIN_DIR    - optional in addition to E_PREFIX to provide\n"
diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in
index 6e272fc3e0..7105051326 100644
--- a/legacy/embryo/configure.in
+++ b/legacy/embryo/configure.in
@@ -33,39 +33,35 @@ fi
 
 AC_SUBST(fnmatch_libs)
 
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
-fi
-
-dnl Set PACKAGE_BIN_DIR in config.h.
 if test "x${bindir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation directory for user executables])
+    PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation directory for user executables])
+    PACKAGE_BIN_DIR="${prefix}/bin"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user executables])
+  PACKAGE_BIN_DIR="${bindir}"
 fi
+AC_SUBST(PACKAGE_BIN_DIR)
 
-dnl Set PACKAGE_LIB_DIR in config.h.
 if test "x${libdir}" = 'xNONE'; then
   if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation directory for libraries] )
+    PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for libraries])
+    PACKAGE_LIB_DIR="${prefix}/lib"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries])
+  PACKAGE_LIB_DIR="${libdir}"
 fi
-
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
-
+AC_SUBST(PACKAGE_LIB_DIR)
+		
+if test "x${prefix}" = "xNONE"; then
+  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+else
+  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+fi
+AC_SUBST(PACKAGE_DATA_DIR)
+	
 AC_OUTPUT([
 Makefile
 embryo.pc
diff --git a/legacy/embryo/src/bin/Makefile.am b/legacy/embryo/src/bin/Makefile.am
index 0d271f9887..2a43e97ac2 100644
--- a/legacy/embryo/src/bin/Makefile.am
+++ b/legacy/embryo/src/bin/Makefile.am
@@ -1,6 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -DLINUX -I$(top_srcdir)/src/lib -I$(top_srcdir) -I$(top_builddir)
+INCLUDES = -DLINUX -I$(top_srcdir)/src/lib -I$(top_srcdir) -I$(top_builddir) \
+           -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+	   -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+	   -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\"
 
 bin_PROGRAMS = embryo embryo_cc
 
diff --git a/legacy/embryo/src/bin/embryo_cc_prefix.c b/legacy/embryo/src/bin/embryo_cc_prefix.c
index 3033d06d23..17557b2b42 100644
--- a/legacy/embryo/src/bin/embryo_cc_prefix.c
+++ b/legacy/embryo/src/bin/embryo_cc_prefix.c
@@ -296,7 +296,7 @@ _e_prefix_fallbacks(void)
    _prefix_path_lib    = strdup(PACKAGE_LIB_DIR);
    printf("WARNING: Embryo could not determine its installed prefix\n"
 	  "         and is falling back on the compiled in default:\n"
-	  "           %s\n", 
+	  "           %s\n"
 	  "         You might like to try setting the following environment variables:\n"
 	  "           E_PREFIX     - points to the base prefix of install\n"
 	  "           E_BIN_DIR    - optional in addition to E_PREFIX to provide\n"