typo in HAVE_GNUMAKE_FILE_FUNC, and var2file must return the filename

config_host.mk.in

@@ -188,7 +188,7 @@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@
 export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
 export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
-export HAVE_GNUMAKE_FILE_FUNC@=HAVE_GNUMAKE_FILE_FUNC@
+export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@
 export HAVE_GETOPT=@HAVE_GETOPT@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@

configure.in

@@ -3697,7 +3697,7 @@ all:
 EOF
 $GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2
 if test -f $TESTGMAKEFILEFUNC/test.txt ; then
-    HAVE_GNUMKAE_FILE_FUNC="YES"
+    HAVE_GNUMAKE_FILE_FUNC="YES"
     AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([no])

solenv/gbuild/Tempfile.mk

@@ -2,7 +2,7 @@
 
 ifeq ($(HAVE_GNUMAKE_FILE_FUNC),YES)
 define var2file
-$(file >$(1),$(3))
+$(file >$(1),$(3))$(1)
 endef
 else
 # Write string to temporary file by chopping into pieces that