From f909378a1d25f7de9405ca3c4f59d2aa3acfae6f Mon Sep 17 00:00:00 2001
From: Mark VanderVoord <mvandervoord@gmail.com>
Date: Sun, 7 Jul 2019 14:43:20 -0400
Subject: [PATCH] Clean up example makefile to properly support externally
 supported paths. (This is a tiny fix to PR 193)

---
 examples/make_example/Makefile |  8 ++++----
 scripts/create_makefile.rb     | 16 ++++++++--------
 vendor/unity                   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/examples/make_example/Makefile b/examples/make_example/Makefile
index 8a2f403..a0fe532 100644
--- a/examples/make_example/Makefile
+++ b/examples/make_example/Makefile
@@ -1,8 +1,8 @@
 CC ?= gcc
-BUILD_DIR ?= ./build
-SRC_DIR ?= ./src
-TEST_DIR ?= ./test
-TEST_BUILD_DIR ?= ${BUILD_DIR}/test
+export BUILD_DIR ?= ./build
+export SRC_DIR ?= ./src
+export TEST_DIR ?= ./test
+export TEST_BUILD_DIR ?= ${BUILD_DIR}/test
 TEST_MAKEFILE = ${TEST_BUILD_DIR}/MakefileTestSupport
 OBJ ?= ${BUILD_DIR}/obj
 OBJ_DIR = ${OBJ}
diff --git a/scripts/create_makefile.rb b/scripts/create_makefile.rb
index e9a9ffb..0aac4bb 100644
--- a/scripts/create_makefile.rb
+++ b/scripts/create_makefile.rb
@@ -34,9 +34,9 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
 
   # Define make variables
   mkfile.puts "CC ?= gcc"
-  mkfile.puts "BUILD_DIR ?= ./build"
-  mkfile.puts "SRC_DIR ?= ./src"
-  mkfile.puts "TEST_DIR ?= ./test"
+  mkfile.puts "BUILD_DIR = #{BUILD_DIR}"
+  mkfile.puts "SRC_DIR = #{SRC_DIR}"
+  mkfile.puts "TEST_DIR = #{TEST_DIR}"
   mkfile.puts "TEST_CFLAGS ?= -DTEST"
   mkfile.puts "CMOCK_DIR ?= #{CMOCK_DIR}"
   mkfile.puts "UNITY_DIR ?= #{UNITY_DIR}"
@@ -60,8 +60,8 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
   test_targets = []
   generator = UnityTestRunnerGenerator.new
 
-  # headers that begin with prefix or end with suffix are not included 
-  all_headers = Dir["#{SRC_DIR}/**/*.h"]  
+  # headers that begin with prefix or end with suffix are not included
+  all_headers = Dir["#{SRC_DIR}/**/*.h"]
 
   def reject_mock_files(file)
     extn = File.extname file
@@ -73,7 +73,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
   end
 
   all_headers = all_headers.reject { |f| reject_mock_files(f) }
-  
+
   makefile_targets = []
 
   test_sources.each do |test|
@@ -96,7 +96,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
     if not makefile_targets.include? module_obj
         makefile_targets.push(module_obj)
         mkfile.puts "#{module_obj}: #{module_src}"
-        mkfile.puts "\t${CC} -o $@ -c $< ${TEST_CFLAGS} -I #{SRC_DIR} ${INCLUDE_PATH}"
+        mkfile.puts "\t${CC} -o $@ -c $< ${TEST_CFLAGS} -I ${SRC_DIR} ${INCLUDE_PATH}"
         mkfile.puts ""
     end
 
@@ -112,7 +112,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
         if not makefile_targets.include? linkonlymodule_obj
             makefile_targets.push(linkonlymodule_obj)
             mkfile.puts "#{linkonlymodule_obj}: #{linkonlymodule_src}"
-            mkfile.puts "\t${CC} -o $@ -c $< ${TEST_CFLAGS} -I #{SRC_DIR} ${INCLUDE_PATH}"
+            mkfile.puts "\t${CC} -o $@ -c $< ${TEST_CFLAGS} -I ${SRC_DIR} ${INCLUDE_PATH}"
             mkfile.puts ""
         end
     end
diff --git a/vendor/unity b/vendor/unity
index 0892db2..1100c5d 160000
--- a/vendor/unity
+++ b/vendor/unity
@@ -1 +1 @@
-Subproject commit 0892db23760b0dbe06f2644384ad29c3f7d14779
+Subproject commit 1100c5d8f0af9f3a68df37e592564535c5de72c6