use m4wrap instead of end.m4

HackerFoo · Sep 25, 2019 · 980e6a8 · 980e6a8
1 parent f5e70c9
commit 980e6a8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/end.m4 b/end.m4
diff --git a/functions/main b/functions/main
@@ -17,7 +17,7 @@ GO(update)
     pushd ${__GO_DIR}/functions > /dev/null
     for src in `find -L * -type f ! -name '*~'`
     do
-        eval "`m4 {{-DGO_CMD=}}GO_CMD ../macros.m4 ${src} ../end.m4`"
+        eval "`m4 {{-DGO_CMD=}}GO_CMD ../macros.m4 ${src}`"
         printf "%40s | " "${src}"
         date -r ${src}
     done

diff --git a/load b/load
@@ -6,6 +6,6 @@ __GO_CMD=go
 
 __GO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-eval "`m4 -DGO_CMD=${__GO_CMD} ${__GO_DIR}/macros.m4 ${__GO_DIR}/functions/main ${__GO_DIR}/end.m4`"
+eval "`m4 -DGO_CMD=${__GO_CMD} ${__GO_DIR}/macros.m4 ${__GO_DIR}/functions/main`"
 
 ${__GO_CMD} update > /dev/null
diff --git a/macros.m4 b/macros.m4
@@ -61,3 +61,6 @@ define({{GO_CALL}}, {{__}}GO_CMD:$1)dnl
 dnl
 dnl format is a common identifier, so undefine m4's format
 undefine({{format}})dnl
+dnl
+dnl close remaining braces
+m4wrap({{__END}})