Update to top of tree

diff --git a/exe/compile-txt.tpl b/exe/compile-txt.tpl
index 58b1e1821432abe9c00c7e77ec159b90dc870034..5e04dc08df07478ce9a784384782e07a41e534f7 100644 (file)
--- a/exe/compile-txt.tpl
+++ b/exe/compile-txt.tpl
@@ -41,7 +41,8 @@ easier to understand.
     do
       case "$arg_mode" in
       arg  )
-       lastarg="$arg"  # do not "continue".  Instead, add this to base_compile
+       # do not "continue".  Instead, add this to base_compile
+       lastarg="$arg"
        arg_mode=normal
        ;;
 

diff --git a/exe/ltmain.tpl b/exe/ltmain.tpl
index 20c9149aa56854deba47707613821271151a1dd7..b46fb6396269773e44eaa7a22621990b968668d5 100644 (file)
--- a/exe/ltmain.tpl
+++ b/exe/ltmain.tpl
@@ -83,6 +83,9 @@ show="$echo"
 show_help=
 execute_dlfiles=
 
+# set the tag name so that it defaults to CC
+tagname="CC"
+
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do