Fixes and other changes to the demo and some library modules so they

[wxWidgets.git] / wxPython / distrib / mac / _build

diff --git a/wxPython/distrib/mac/_build b/wxPython/distrib/mac/_build
index 6c3305925570bac8311596687a88e93cead3c163..d0c81c5e96c70acb603d891206bc2783a93e83d4 100755 (executable)
--- a/wxPython/distrib/mac/_build
+++ b/wxPython/distrib/mac/_build
@@ -17,8 +17,10 @@ progDir="`dirname \"$0\"`"
 defSrcPath="/projects/wx"
 defDstPath="/projects/wx/wxPython/dist"
 
-pkgName="wxMacPython"
-version=`date +"%Y-%m-%d"`
+pkgName="wxPythonOSX"
+#version=`date +"%Y-%m-%d"`
+version=`cd $defSrcPath/wxPython; python$PYVER -c 'import setup;print setup.VERSION'`
+
 dmgRoot="dmg-root"
 pkgRoot="pkg-root"
 wxWindowsInst="$pkgRoot/usr/local"
@@ -158,7 +160,12 @@ cd $curDir
 msg installing wxWindows
 msgdo mkdir -p -m 755 "$dstPath/$temp/$wxWindowsInst"
 msgdo cd "$buildDir"
+
+# install once to the package directory, and once to the
+# local machine so the wxPython build will get the right wxMac
 msgdo make install "prefix=`quotemeta \"$dstPath/$temp/$wxWindowsInst\"`"
+msgdo make install
+
 msgdo chown -R root:wheel "$dstPath/$temp/$pkgRoot/usr"
 cd $curDir