Commit 7594ea18 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Change how the OS X installer's create-links finds the versin number

It now gets created by configure, rather than trying to work out the
version number at runtime.
parent d1fecad7
......@@ -950,7 +950,7 @@ if grep ' ' compiler/ghc.cabal.in 2>&1 >/dev/null; then
AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
fi
AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/ghc.iss distrib/configure.ac])
AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml docs/index.html libraries/prologue.txt distrib/ghc.iss distrib/configure.ac distrib/MacOS/installer-scripts/create-links])
AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
AC_OUTPUT
......
......@@ -20,7 +20,7 @@ if [ "$INSTALL_BASE" = / ]; then
INSTALL_BASE=/usr
fi
ProjectVersionInt=$(readlink "$INSTALL_DEST/GHC.framework/Versions/Current")
ProjectVersionInt=@ProjectVersionInt@
GHC_BASE="$INSTALL_DEST/GHC.framework/Versions/$ProjectVersionInt"
INSTALL_BIN="$INSTALL_BASE/bin"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment