X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=aclocal.m4;h=bfd91fc5ca76513ea8d2d7537cc610b904b81e7b;hp=d4a58f98da748fcc8000aa6b0d2718de7e526bb0;hb=21eeb926c8bf398e38919429d2375b78be45b14b;hpb=e51cdf9b6e54fb4052e46b6d7afb15e062928467

diff --git a/aclocal.m4 b/aclocal.m4
index d4a58f9..bfd91fc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -415,7 +415,7 @@ else
   touch conftest.dummy
   for fp_var in clqsZ clqs cqs clq cq ; do
      rm -f conftest.a
-     if $fp_prog_ar_raw $fp_var conftest.a conftest.dummy > /dev/null 2> /dev/null; then
+     if "$fp_prog_ar_raw" $fp_var conftest.a conftest.dummy > /dev/null 2> /dev/null; then
         fp_cv_prog_ar_args=$fp_var
         break
      fi
@@ -426,7 +426,8 @@ else
   fi
 fi])
 fp_prog_ar_args=$fp_cv_prog_ar_args
-AC_SUBST([ArCmd], ["$fp_prog_ar $fp_prog_ar_args"])
+AC_SUBST([ArCmd], ["$fp_prog_ar"])
+AC_SUBST([ArArgs], ["$fp_prog_ar_args"])
 
 ])# FP_PROG_AR_ARGS
 
@@ -1207,7 +1208,7 @@ if test ! -f utils/ghc-pwd/ghc-pwd && test ! -f utils/ghc-pwd/ghc-pwd.exe; then
   rm -f *.hi
   rm -f ghc-pwd
   rm -f ghc-pwd.exe
-  $WithGhc -v0 --make ghc-pwd -o ghc-pwd
+  "$WithGhc" -v0 --make ghc-pwd -o ghc-pwd
   cd ../..
 fi