From d9822f7d3357d2f1c742de51668232e2c6e16898 Mon Sep 17 00:00:00 2001
From: Steven Stewart-Gallus <sstewartgallus00@mylangara.bc.ca>
Date: Tue, 3 Nov 2015 20:35:02 -0800
Subject: [PATCH] Make the default project use more directories

---
 assistants/crt/c.yaml    | 11 ++++++++---
 files/crt/c/configure.ac | 10 +++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/assistants/crt/c.yaml b/assistants/crt/c.yaml
index 4e3cc8e..c72b71a 100644
--- a/assistants/crt/c.yaml
+++ b/assistants/crt/c.yaml
@@ -64,11 +64,16 @@ run:
   - use: git.init_add_commit.run
 - else:
   - cl: cd "$lowername"
-  - log_i: 'Project already exists'  
+  - log_i: 'Project already exists'
+- log_i: 'Make autoconf macrodir'
+- cl_i: mkdir -p m4
 - log_i: 'Run autoreconf'
 - cl_i: autoreconf --install
+- log_i: 'Make build directory'
+- cl_i: mkdir -p build
 - log_i: 'Run configure script'
-- cl_i: ./configure
+- cl_i: cd build
+- cl_i: ../configure
 - cl_i: make clean
 - log_i: 'Compiling sources'
 - cl_i: make
@@ -78,7 +83,7 @@ run:
 - log_i: 'source file using autotools'
 - log_i: 'More information about autotools can be found here:'
 - log_i: 'automake: http://www.gnu.org/software/automake/manual/automake.html'
-- log_i: 'autoconf: http://www.gnu.org/software/autoconf/manual/autoconf.html' 
+- log_i: 'autoconf: http://www.gnu.org/software/autoconf/manual/autoconf.html'
 - if defined $vim:
   - use: vim.run
 - if defined $build:
diff --git a/files/crt/c/configure.ac b/files/crt/c/configure.ac
index ffde081..d8d325e 100644
--- a/files/crt/c/configure.ac
+++ b/files/crt/c/configure.ac
@@ -1,13 +1,21 @@
 #This line defines the name of the output tarball
 AC_INIT([CDevelopmentTool],[0.0])
+dnl
+AC_CONFIG_AUX_DIR([build-aux])
+dnl
 #this line defines what compilation flags will be used
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects -Wall])
+dnl
 # DEFINE YOUR OWN HEADERS CHECK - DO NOT DELETE THIS LINE
 #this line defines what libraries should be used during building
 AC_CHECK_LIB([pthread],[pthread_create])
 AC_CHECK_LIB([pthread],[pthread_join])
+dnl
 # DEFINE YOUR OWN LIBRARY CHECK - DO NOT DELETE THIS LINE
 AC_PROG_CC
+dnl
+AC_CONFIG_MACRO_DIR([m4])
+dnl
 #This line defines where Makefiles are stored for projects and sources
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT