1.1 --- a/Admin/makebundle	Tue Apr 17 19:16:13 2012 +0200
     1.2 +++ b/Admin/makebundle	Tue Apr 17 20:48:07 2012 +0200
     1.3 @@ -57,7 +57,13 @@
     1.4  
     1.5      if [ -e "$ISABELLE_HOME/contrib/$NAME/etc/settings" ]; then
     1.6        echo "component $NAME"
     1.7 -      echo "contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
     1.8 +      if [ "$PLATFORM" != x86-cygwin -a "$NAME" = ProofGeneral-3.7.1.1 ]; then
     1.9 +        echo "#contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
    1.10 +      elif [ "$PLATFORM" = x86-cygwin -a "$NAME" = ProofGeneral-4.1 ]; then
    1.11 +        echo "#contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
    1.12 +      else
    1.13 +        echo "contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
    1.14 +      fi
    1.15      else
    1.16        echo "package $NAME"
    1.17      fi
    1.18 @@ -70,12 +76,6 @@
    1.19  echo "heaps"
    1.20  tar -C "$TMP" -x -z -f "$HEAPS_ARCHIVE"
    1.21  
    1.22 -
    1.23 -(
    1.24 -  cd "$TMP/$ISABELLE_NAME/contrib/ProofGeneral"
    1.25 -  find . -name "*.elc" -exec rm {} ";"
    1.26 -)
    1.27 -
    1.28  case "$PLATFORM" in
    1.29    x86_64-linux)
    1.30      perl -pi -e 's,^ML_PLATFORM=.*$,ML_PLATFORM="\$ISABELLE_PLATFORM64",g;' "$TMP/$ISABELLE_NAME/etc/settings"
    1.31 @@ -90,8 +90,6 @@
    1.32    *-cygwin)
    1.33      perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel,g;" \
    1.34        "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props"
    1.35 -    rm "$TMP/$ISABELLE_NAME/contrib/ProofGeneral"
    1.36 -    ln -s ProofGeneral-3.7.1.1 "$TMP/$ISABELLE_NAME/contrib/ProofGeneral"
    1.37      ;;
    1.38    *)
    1.39      ;;