Index: do-install
@@ -1,27 +1,23 @@
 #!/bin/sh
 
-BINDIR=/usr/local/bin
-LIBDIR=/usr/local/lib
+BINDIR=${PREFIX}/bin
+LIBDIR=${PREFIX}/lib
+APP=${PREFIX}/lib/X11/app-defaults
 
-install="sh ./install-sh"
-
-if [ ! -f ./bin/rosegarden ]; then
-  echo "You're supposed to build it first..."
-  exit 1
-fi
+install=/usr/bin/install
 
 echo
 echo Rosegarden 2.1 basic install script
 echo
-echo 'Enter directory for the main rosegarden executable ['$BINDIR']'
-read newbin
-if [ t"$newbin" != t ]; then BINDIR="$newbin"; fi
-echo 'Enter directory to contain the rosegarden lib directory ['$LIBDIR']'
-read newlib
-if [ t"$newlib" != t ]; then LIBDIR="$newlib"; fi
-echo
-echo Thanks
-echo
+# echo 'Enter directory for the main rosegarden executable ['$BINDIR']'
+# read newbin
+# if [ t"$newbin" != t ]; then BINDIR="$newbin"; fi
+# echo 'Enter directory to contain the rosegarden lib directory ['$LIBDIR']'
+# read newlib
+# if [ t"$newlib" != t ]; then LIBDIR="$newlib"; fi
+# echo
+# echo Thanks
+# echo
 
 ROSELIBDIR=$LIBDIR/rosegarden
 
@@ -46,20 +42,20 @@
 $install -c -m 644 ./common/help/rosehelp.hnx  $ROSELIBDIR/help
 
 $install -d $ROSELIBDIR/petal
-test -f ./petal/Petal.so && $install -m 644 ./petal/Petal.so $ROSELIBDIR/petal
+test -f ./petal/Petal.so && $install -c -m 644 ./petal/Petal.so $ROSELIBDIR/petal
 $install -c ./petal/Petal.tcl $ROSELIBDIR/petal
 $install -c ./petal/petaleditor/PetalEditor.tcl $ROSELIBDIR/petal
 $install -c ./petal/petalmidi/PetalMidi.tcl $ROSELIBDIR/petal
 
-( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh )
+( cd $ROSELIBDIR/petal ; echo "pkg_mkIndex . Petal.so *.tcl" | tclsh8.0 )
 
 $install -d $ROSELIBDIR/rosepetal-filters
 $install -c ./petal/harmonizer.tcl $ROSELIBDIR/rosepetal-filters
 $install -c ./petal/pattern.tcl $ROSELIBDIR/rosepetal-filters
 
-test -d $HOME/.. || exit 0  # not set
-test -f $HOME/Rosegarden && mv $HOME/Rosegarden $HOME/Rosegarden.SAVED
-$install -c -m 644 Rosegarden $HOME
+
+test -f $APP/Rosegarden && mv $APP/Rosegarden $APP/Rosegarden.SAVED
+$install -c -m 644 Rosegarden $APP
 
  )