diff --git a/src/lib/edi_builder.c b/src/lib/edi_builder.c
index 3c90763..b5713de 100644
--- a/src/lib/edi_builder.c
+++ b/src/lib/edi_builder.c
@@ -23,34 +23,38 @@ _edi_builder_build_make(void)
 {
    chdir(edi_project_get());
    ecore_exe_pipe_run("make", ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
-                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR, NULL);
+                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
+                              ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void
 _edi_builder_build_configure(void)
 {
    chdir(edi_project_get());
-   ecore_exe_pipe_run("/bin/sh -c \"./configure && make\"",
+   ecore_exe_pipe_run("./configure && make",
                               ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
-                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR, NULL);
+                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
+                              ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void
 _edi_builder_build_cmake(void)
 {
    chdir(edi_project_get());
-   ecore_exe_pipe_run("/bin/sh -c \"mkdir -p build && cd build && cmake .. && make && cd ..\"",
+   ecore_exe_pipe_run("mkdir -p build && cd build && cmake .. && make && cd ..",
                               ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
-                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR, NULL);
+                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
+                              ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void
 _edi_builder_build_autogen(void)
 {
    chdir(edi_project_get());
-   ecore_exe_pipe_run("/bin/sh -c \"./autogen.sh && make \"",
+   ecore_exe_pipe_run("./autogen.sh && make",
                               ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
-                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR, NULL);
+                              ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | ECORE_EXE_PIPE_ERROR |
+                              ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void