fix bin/lib prefix - pass as -D

SVN revision: 23874

configure.in

@@ -73,36 +73,37 @@ MODULE_ARCH="$host_os-$host_cpu"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
 
-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", "Package installed binaries destination")
+    PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", "Package installed binaries destination")
+    PACKAGE_BIN_DIR="${prefix}/bin"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", "Package installed binaries destination")
+  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", "Package installed libraries destination")
+    PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
   else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed libraries destination")
+    PACKAGE_LIB_DIR="${prefix}/lib"
   fi
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed libraries destination")
+  PACKAGE_LIB_DIR="${libdir}"
 fi
+AC_SUBST(PACKAGE_LIB_DIR)
 
-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}", "Package installed data destination")
-  AC_DEFINE_UNQUOTED(LOCALE_DIR, "${ac_default_prefix}/share/locale", "Locale directory")
+  PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+  LOCALE_DIR="${ac_default_prefix}/share/locale"
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
-  AC_DEFINE_UNQUOTED(LOCALE_DIR, "${prefix}/share/locale", "Locale directory")
+  PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
+  LOCALE_DIR="${prefix}/share/locale"
 fi
+AC_SUBST(PACKAGE_DATA_DIR)
+AC_SUBST(LOCALE_DIR)
 
 x_dir=""
 x_cflags=""

src/bin/Makefile.am

@@ -6,7 +6,11 @@ INCLUDES = -I$(top_srcdir) \
 	   @x_cflags@ \
 	   @cf_cflags@ \
 	   @VALGRIND_CFLAGS@ \
-	   @EDJE_DEF@
+	   @EDJE_DEF@ \
+	   -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
+	   -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
+	   -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
+	   -DLOCALE_DIR=\"@LOCALE_DIR@\"
 
 bin_PROGRAMS = \
 enlightenment \

src/bin/e_prefix.c

@@ -71,7 +71,7 @@ e_prefix_determine(char *argv0)
      {
 	if (!_e_prefix_try_argv(argv0))
 	  {
-	     _e_prefix_fallbacks();
+	     e_prefix_fallback();
 	     return 0;
 	  }
      }
@@ -349,7 +349,7 @@ _e_prefix_fallbacks(void)
    _prefix_path_lib    = strdup(PACKAGE_LIB_DIR);
    printf("WARNING: Enlightenment 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"

src/bin/e_test.c

@@ -584,6 +584,29 @@ _e_test_internal(E_Container *con)
    
    evas_object_focus_set(o, 1);
 }
+#elif 0
+static void
+_e_test_internal(E_Container *con)
+{
+   E_Dialog *dia;
+   Evas_Object *o;
+   Evas_Coord mw, mh;
+   
+   dia = e_dialog_new(con);
+   e_dialog_title_set(dia, "A Test Dialog");
+   
+   o = e_fm2_add(dia->win->evas);
+   e_fm2_path_set(o, "~/", "/");
+   evas_object_show(o);
+   
+   e_dialog_content_set(dia, o, 480, 320);
+   
+   e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
+   e_win_centered_set(dia->win, 1);
+   e_dialog_show(dia);
+   
+   evas_object_focus_set(o, 1);
+}
 #else
 static void
 _e_test_internal(E_Container *con)