X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06bb3c60d188c7dd16fa42821cb4dc071cdcdcbc..695c21b11876abafeb68195e34f9f55816f92949:/distrib/msw/tarwxmac?ds=sidebyside

diff --git a/distrib/msw/tarwxmac b/distrib/msw/tarwxmac
index 60a71dd2ec..6b312561a5 100755
--- a/distrib/msw/tarwxmac
+++ b/distrib/msw/tarwxmac
@@ -65,17 +65,21 @@ rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 rm -f $2/wxMac-${WXVER}*.tar.gz
 rm -f -r $2/wxMac-${WXVER}
 
+cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
+
 echo Tarring...
 
 ### wxMac
-cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
 $TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
+rm -f $1/include/wx/setup.h
+
 echo Re-tarring in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxMac-${WXVER}
+cd wxMac-${WXVER}
 $TAR xf ../wxMac-${WXVER}.tar
 
 # Remove mmedia
@@ -83,8 +87,8 @@ rm -f -r contrib/src/mmedia contrib/samples/mmedia
 cd ..
 rm -f wxMac-${WXVER}.tar
 
-$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxMac-${WXVER}.tar wxMac-${WXVER}/*
+rm -f -r wxMac-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 
 # Copy readme and other files