move internal binaries to subdir - patch from albin

SVN revision: 38414

src/bin/Makefile.am

@@ -1,4 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
+
 INCLUDES = -I$(top_srcdir) \
 	   -I$(top_srcdir)/src/bin \
 	   -I$(top_srcdir)/src/lib \
@@ -18,13 +19,16 @@ enlightenment \
 enlightenment_remote \
 enlightenment_imc \
 enlightenment_start \
-enlightenment_thumb \
-enlightenment_sys \
-enlightenment_fm \
-enlightenment_init \
-enlightenment_fm_op \
 enlightenment_fm_open
 
+internal_bindir = $(libdir)/enlightenment/utils
+internal_bin_PROGRAMS = \
+enlightenment_init \
+enlightenment_fm \
+enlightenment_fm_op \
+enlightenment_sys \
+enlightenment_thumb
+
 ENLIGHTENMENTHEADERS = \
 e.h \
 e_includes.h \

src/bin/e_fm.c

@@ -1511,7 +1511,7 @@ _e_fm2_client_spawn(void)
    char buf[4096];
    
    if (_e_fm2_client_spawning) return;
-   snprintf(buf, sizeof(buf), "%s/enlightenment_fm", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_fm", e_prefix_lib_get());
    exe = ecore_exe_run(buf, NULL);
    _e_fm2_client_spawning = 1;
 }

src/bin/e_fm_main.c

@@ -2177,7 +2177,7 @@ _e_prepare_command(E_Fm_Op_Type type, const char *args)
 
    length = 256 + strlen(e_prefix_bin_get()) + strlen(args);
    buffer = malloc(length);
-   length = snprintf(buffer, length, "%s/enlightenment_fm_op %s %s", e_prefix_bin_get(), command, args);
+   length = snprintf(buffer, length, "%s/enlightenment/utils/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args);
 
    return buffer;
 }

src/bin/e_init.c

@@ -77,8 +77,8 @@ e_init_show(void)
    if (version) ver = strdup(e_util_filename_escape(version));
    else ver = strdup("XvX");
 
-   snprintf(buf, sizeof(buf), "%s/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
-	    e_prefix_bin_get(),
+	    e_prefix_lib_get(),
 	    theme,
 	    e_canvas_engine_decide(e_config->evas_engine_init),
 	    e_config->font_hinting,

src/bin/e_sys.c

@@ -168,13 +168,13 @@ _e_sys_cb_timer(void *data)
    char buf[4096];
    
    e_init_status_set(_("Checking System Permissions"));
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t halt", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t halt", e_prefix_lib_get());
    _e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t reboot", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t reboot", e_prefix_lib_get());
    _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t suspend", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t suspend", e_prefix_lib_get());
    _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
-   snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t hibernate", e_prefix_bin_get());
+   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get());
    _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
    return 0;
 }
@@ -515,8 +515,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
       case E_SYS_HALT_NOW:
 	/* shutdown -h now */
 	if (e_util_immortal_check()) return 0;
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt",
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys halt",
-		 e_prefix_bin_get());
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -542,8 +542,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
       case E_SYS_REBOOT:
 	/* shutdown -r now */
 	if (e_util_immortal_check()) return 0;
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys reboot",
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys reboot",
-		 e_prefix_bin_get());
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -568,8 +568,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 	break;
       case E_SYS_SUSPEND:
 	/* /etc/acpi/sleep.sh force */
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys suspend",
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys suspend",
-		 e_prefix_bin_get());
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();
@@ -594,8 +594,8 @@ _e_sys_action_do(E_Sys_Action a, char *param)
 	break;
       case E_SYS_HIBERNATE:
 	/* /etc/acpi/hibernate.sh force */
-	snprintf(buf, sizeof(buf), "%s/enlightenment_sys hibernate",
+	snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys hibernate",
-		 e_prefix_bin_get());
+		 e_prefix_lib_get());
 	if (_e_sys_exe)
 	  {
 	     _e_sys_current_action();

src/bin/e_thumb.c

@@ -135,7 +135,7 @@ e_thumb_icon_begin(Evas_Object *obj)
 	  {
 	     Ecore_Exe *exe;
 
-	     snprintf(buf, sizeof(buf), "%s/enlightenment_thumb --nice=%d", e_prefix_bin_get(),
+	     snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_thumb --nice=%d", e_prefix_lib_get(),
 		      e_config->thumb_nice);
 	     exe = ecore_exe_run(buf, NULL);
 	     _thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe);