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.

diff --git a/configure.ac b/configure.ac
index dc94cf3..b281cd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
 

diff --git a/distrib/MacOS/installer-scripts/create-links b/distrib/MacOS/installer-scripts/create-links.in
similarity index 93%
rename from distrib/MacOS/installer-scripts/create-links
rename to distrib/MacOS/installer-scripts/create-links.in
index 58bed89..2e3dc5e 100644 (file)
--- a/distrib/MacOS/installer-scripts/create-links
+++ b/distrib/MacOS/installer-scripts/create-links.in
@@ -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"