wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip \r's to fix building on Windows

Browse Source
This commit is contained in:
Ian Lynagh 2007-03-16 22:47:55 +00:00
parent 48e054cfd5
commit 1872c2735a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -63,7 +63,7 @@ AC_DEFINE_UNQUOTED(LEADING_UNDERSCORE, $LEADING_UNDERSCORE,
# Find pwd, in a cygwin friendly way. # Find pwd, in a cygwin friendly way.
# Suggested by: http://www.haskell.org/ghc/docs/latest/html/users_guide/ch11s04.html # Suggested by: http://www.haskell.org/ghc/docs/latest/html/users_guide/ch11s04.html
TOP=`echo "Directory.getCurrentDirectory >>= putStrLn.init.tail.show " | ghc --interactive -ignore-dot-ghci -v0` TOP=`echo "Directory.getCurrentDirectory >>= putStrLn.init.tail.show " | ghc --interactive -ignore-dot-ghci -v0 | tr -d '\r'`
AC_DEFINE_UNQUOTED(TOP, "$TOP", [Path to top of build tree]) AC_DEFINE_UNQUOTED(TOP, "$TOP", [Path to top of build tree])
AC_SUBST(TOP) AC_SUBST(TOP)
@ -100,7 +100,7 @@ AC_SUBST(GLASGOW_HASKELL)
# find path to GHC libs, for runtime_loader # find path to GHC libs, for runtime_loader
if test -n "$GHC" ; then if test -n "$GHC" ; then
AC_MSG_CHECKING([for ghc library directory]) AC_MSG_CHECKING([for ghc library directory])
GHC_LIB_PATH=`$GHC --print-libdir` GHC_LIB_PATH=`$GHC --print-libdir | tr -d '\r'`
AC_MSG_RESULT([$GHC_LIB_PATH]) AC_MSG_RESULT([$GHC_LIB_PATH])
fi fi
AC_DEFINE_UNQUOTED(GHC_LIB_PATH, "$GHC_LIB_PATH", [Path to ghc libraries]) AC_DEFINE_UNQUOTED(GHC_LIB_PATH, "$GHC_LIB_PATH", [Path to ghc libraries])