Attempt to set the version strings correctly.

diff --git a/dist/make-macosx-app b/dist/make-macosx-app
index c84993c412a334a28eaa27a407c97d0af1e69c24..901dad59ac6360ee022b379c8098f9ebb83a4d91 100755 (executable)
--- a/dist/make-macosx-app
+++ b/dist/make-macosx-app
@@ -52,7 +52,6 @@ compile ()
 {
     my_configure --enable-native-code="${ARCH}" "${@}"
     my_make compile-microcode
-    etc/macosx/make-app.sh
 }
 
 notify "Compiling executable"
@@ -60,6 +59,7 @@ unpack_dist_file_to "${ARCH_BASE}" "${DIST_DIR}"
 run_command "${OUT}"-compile "${DIST_DIR}"/src compile "${@}"
 
 notify "Building application bundle"
-run_command "${OUT}"-buildapp "${DIST_DIR}"/src etc/macosx/make-app.sh
+VERSION_STRING=${RELEASE} \
+    run_command "${OUT}"-buildapp "${DIST_DIR}"/src etc/macosx/make-app.sh
 my_rm_rf "${ARCH_BASE}".app
 my_mv "${DIST_DIR}"/src/mit-scheme.app "${ARCH_BASE}".app

diff --git a/src/etc/macosx/make-app.sh b/src/etc/macosx/make-app.sh
index 087ca4147d2b62e9280aff1b7bede301c00cac9a..52d267c6fd5f5b31496246d2ea2a3db5abc654a5 100755 (executable)
--- a/src/etc/macosx/make-app.sh
+++ b/src/etc/macosx/make-app.sh
@@ -29,11 +29,13 @@ set -e
 # These values are placeholders; we need to get the right ones.
 : ${VERSION_STRING=9.1}
 : ${LONG_VERSION_STRING="release ${VERSION_STRING}"}
-: ${MACOSX_MIN_VERSION=10.6}
 : ${YEAR=$(date +%Y)}
 : ${bindir=/usr/local/bin}
 : ${libdir=/usr/local/lib}
 
+MACOSX_VERSION=$(sw_vers | grep ^ProductVersion: | grep -E -o '[0-9]+\.[0-9]+')
+: ${MACOSX_MIN_VERSION=${MACOSX_VERSION}}
+
 rm -rf tmp mit-scheme.app
 
 # Build directory structure for bundle.