removed -a option;
authorwenzelm
Tue Apr 26 20:41:37 2005 +0200 (2005-04-26)
changeset 15856674ff97ce0ef
parent 15855 55e443aa711d
child 15857 83cb9dae3817
removed -a option;
fixed -d option to do what -a was trying;
tuned;
lib/Tools/install
     1.1 --- a/lib/Tools/install	Tue Apr 26 20:38:39 2005 +0200
     1.2 +++ b/lib/Tools/install	Tue Apr 26 20:41:37 2005 +0200
     1.3 @@ -16,9 +16,6 @@
     1.4    echo "  Options are:"
     1.5    echo "    -d DISTDIR   refer to DISTDIR as Isabelle distribution"
     1.6    echo "                 (default ISABELLE_HOME)"
     1.7 -  echo "    -a RDISTDIR  refer to RDISTDIR as Isabelle distribution"
     1.8 -  echo "                 in installed files, for packaging scripts"
     1.9 -  echo "                 (default to same value as -d)"
    1.10    echo "    -k VERSION   install KDE application icon on desktop"
    1.11    echo "                 (for KDE VERSION 1 or 2)"
    1.12    echo "    -p DIR       install standalone binaries in DIR"
    1.13 @@ -45,26 +42,19 @@
    1.14  DISTDIR="$ISABELLE_HOME"
    1.15  KDE=""
    1.16  BINDIR=""
    1.17 -RDISTDIR=""
    1.18  
    1.19 -while getopts "d:k:p:a:" OPT
    1.20 +while getopts "d:k:p:" OPT
    1.21  do
    1.22 +  NO_OPTS=""
    1.23    case "$OPT" in
    1.24      d)
    1.25        DISTDIR="$OPTARG"
    1.26 -      NO_OPTS=""
    1.27        ;;
    1.28      k)
    1.29        KDE="$OPTARG"
    1.30 -      NO_OPTS=""
    1.31        ;;
    1.32      p)
    1.33        BINDIR="$OPTARG"
    1.34 -      NO_OPTS=""
    1.35 -      ;;
    1.36 -    a)
    1.37 -      RDISTDIR="$OPTARG"
    1.38 -      NO_OPTS=""
    1.39        ;;
    1.40      \?)
    1.41        usage
    1.42 @@ -79,10 +69,6 @@
    1.43  
    1.44  [ "$#" -ne 0 -o -n "$NO_OPTS" ] && usage
    1.45  
    1.46 -if [ -z "$RDISTDIR" ]; then
    1.47 -  RDISTDIR="$DISTDIR"
    1.48 -fi
    1.49 -
    1.50  
    1.51  ## main
    1.52  
    1.53 @@ -109,7 +95,7 @@
    1.54    for NAME in isatool isabelle-process isabelle-interface
    1.55    do
    1.56      BIN="$BINDIR/$NAME"
    1.57 -    DIST="$RDISTDIR/bin/$NAME"
    1.58 +    DIST="$DISTDIR/bin/$NAME"
    1.59      echo "installing $BIN"
    1.60      rm -f "$BIN"
    1.61      echo "#!$BASH" > "$BIN" || fail "Cannot write file: $BIN"
    1.62 @@ -120,10 +106,9 @@
    1.63    for NAME in Isabelle isabelle
    1.64    do
    1.65      BIN="$BINDIR/$NAME"
    1.66 -    DIST="$DISTDIR/bin/$NAME"
    1.67      echo "installing $BIN"
    1.68      rm -f "$BIN"
    1.69 -    cp "$DIST" "$BIN" || fail "Cannot write file: $BIN"
    1.70 +    cp "$ISABELLE_HOME/bin/$NAME" "$BIN" || fail "Cannot write file: $BIN"
    1.71      chmod +x "$BIN"
    1.72    done
    1.73  fi
    1.74 @@ -159,7 +144,7 @@
    1.75    echo "# KDE Config File" > "$KDEAPP" || fail "Cannot write file: $KDEAPP"
    1.76    echo "[KDE Desktop Entry]" >> "$KDEAPP"
    1.77    echo "Type=Application" >> "$KDEAPP"
    1.78 -  echo "Exec=\"$RDISTDIR/bin/isabelle-interface\" %f" >> "$KDEAPP"
    1.79 +  echo "Exec=\"$DISTDIR/bin/isabelle-interface\" %f" >> "$KDEAPP"
    1.80    echo "Icon=isabelle.xpm" >> "$KDEAPP"
    1.81    echo "TerminalOptions=" >> "$KDEAPP"
    1.82    echo "Path=" >> "$KDEAPP"