make prefix /usr by default, not /opt/gnome

[wxWidgets.git] / distrib / scripts / create_archives.sh

diff --git a/distrib/scripts/create_archives.sh b/distrib/scripts/create_archives.sh
index 88078c99d426f7888aada9b06d7c079203e47feb..b906c4c271c82cbca2f1a8738e54a129286646f8 100755 (executable)
--- a/distrib/scripts/create_archives.sh
+++ b/distrib/scripts/create_archives.sh
@@ -20,10 +20,10 @@ VERBOSE=0
 ZIPFLAGS=
 
 PROGNAME=$0
-SCRIPTDIR=$WXWIN/distrib/scripts
+##SCRIPTDIR=$WXWIN/distrib/scripts
 . $SCRIPTDIR/utils.inc
 
-MANIFESTDIR=$SCRIPTDIR/manifests
+MANIFESTDIR=$WXWIN/distrib/scripts/manifests
 WEBFILES=$WXWIN/../wxWebSite
 if [ ! "$CYGPATH" = "" ]; then
   WEBFILES=`$CYGPATH "$WEBFILES"`
@@ -133,7 +133,7 @@ dospinport(){
     copyfilelist $portfiles $APPDIR $TMPFILESDIR
 
     if [ $port = "msw" ]; then
-        FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec distrib/scripts/is_text.sh {} \; -print \)`
+        FILES=`find . -type f \( -path '*/CVS/*' -prune -o -exec ${SCRIPTDIR}/is_text.sh {} \; -print \)`
         echo "$FILES" > /tmp/textfiles
     fi
 
@@ -142,18 +142,20 @@ dospinport(){
     if [ $port = "msw" ]; then
         pushd /tmp/wx$port/wxWidgets-$VERSION
         for file in `cat /tmp/textfiles`; do
-            todos $file
+            unix2dos $file
         done
         popd
     fi
     echo "Creating wx$portname-$VERSION.zip..."
     zip $ZIPFLAGS -r -9 $APPDIR/deliver/wx$portname-$VERSION.zip .
     echo "Creating wx$portname-$VERSION.tar.gz..."
-    tar czvf $APPDIR/deliver/wx$portname-$VERSION.tar.gz wxWidgets-$VERSION
+    tar czf $APPDIR/deliver/wx$portname-$VERSION.tar.gz wxWidgets-$VERSION
     echo "Creating wx$portname-$VERSION.tar.bz2..."
     tar ch wxWidgets-$VERSION | bzip2 -f9 > $APPDIR/deliver/wx$portname-$VERSION.tar.bz2
     popd
     rm -rf /tmp/wx$port
+    rm ${portfiles}
+#    rm /tmp/textfiles
 }
 
 prepareforrelease()