From 7594ea1867c3dd08696a25c81aca2e2e84f7a25a Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 17 Oct 2010 12:23:52 +0000 Subject: [PATCH] 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. --- configure.ac | 2 +- distrib/MacOS/installer-scripts/{create-links => create-links.in} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename distrib/MacOS/installer-scripts/{create-links => create-links.in} (93%) diff --git a/configure.ac b/configure.ac index dc94cf3..b281cd8 100644 --- 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 --- 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" -- 1.7.10.4