Merged modifications from the 2.6 branch

[wxWidgets.git] / wxPython / distrib / mac / wxPythonOSX / build

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index 0d7a8153a5e5edca88ff4007947fdb97abf7cb6e..9f715731710d1fd0e9c2f3b7dc1794b26a69b868 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -419,7 +419,7 @@ EOF
        $INSTALLROOT \
        $RESOURCEDIR
 
-    mv $PKGNAME.pkg $DMGROOT
+    mv $PKGNAME.pkg $DMGROOT/$PKGNAME.pkg
 
     rm $RESOURCEDIR/postflight
     rm $RESOURCEDIR/preflight
@@ -569,7 +569,7 @@ EOF
     if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
        cat > "$DMGAPPS/Samples/Build ERROR.txt" <<EOF
 
-The wxPython-demo tarball was not found when building this disk image!
+The wxPython-$VERSION-demo tarball was not found when building this disk image!
 
 EOF
        cp "$DMGAPPS/Samples/Build ERROR.txt" $DMGAPPS