From ed9d61551df04ccc492d56f2bff9e60975362c16 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 5 Sep 2002 06:14:07 +0000 Subject: [PATCH] * mcfn_install: Remove. Also remove all references to it. * INSTALL.FAST: Update information about ncurses. From Dmitry Semyonov --- .cvsignore | 1 - ChangeLog | 4 ++ INSTALL | 4 +- INSTALL.FAST | 17 +++--- configure.in | 2 - mcfn_install.in | 136 ------------------------------------------------ 6 files changed, 11 insertions(+), 153 deletions(-) delete mode 100644 mcfn_install.in diff --git a/.cvsignore b/.cvsignore index da87532c6..f0ffde78f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -17,7 +17,6 @@ gettext.m4 intl install-sh mc.spec -mcfn_install missing mkinstalldirs stamp-h diff --git a/ChangeLog b/ChangeLog index 3a46731df..5c8fe4068 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-09-05 Pavel Roskin + * mcfn_install: Remove. Also remove all references to it. + * INSTALL.FAST: Update information about ncurses. + From Dmitry Semyonov + * acinclude.m4 (AC_USE_TERMCAP): Add -ltermcap to MCLIBS, not LIBS. * configure.in: Eliminate MCCFLAGS, use CPPFLAGS instead. Add diff --git a/INSTALL b/INSTALL index 6ed61c930..c56a40c39 100644 --- a/INSTALL +++ b/INSTALL @@ -230,9 +230,7 @@ and linked programs in that directory. 6. GNU Midnight Commander allows you to stay in the last current directory after exiting MC. This is done with a shell function, the man -page has more information about this. If you want to let the install -program make the change to your /etc/profile or your ~/.profile or -~/.bashrc, then type: `make mcfninstall'. +page has more information about this. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need it if you want to regenerate diff --git a/INSTALL.FAST b/INSTALL.FAST index 268b49056..0f6cb5a45 100644 --- a/INSTALL.FAST +++ b/INSTALL.FAST @@ -9,8 +9,7 @@ don't, take it from ftp://ftp.gtk.org/pub/gtk/v1.2/ GNU Midnight Commander by default will use the S-Lang screen manager. It tries the S-Lang library installed on the system, but if it's not found, the included S-Lang sources are used. It is also possible to -use ncurses as the screen manager. Note that syntax highlighting in -the editor is currently unavailable with ncurses. +use ncurses as the screen manager. 1. Configure the package for your system. @@ -34,12 +33,11 @@ the editor is currently unavailable with ncurses. `--with-ncurses[=PATH]' Use the flag without =PATH if you want to compile with ncurses - Use this flag with =PATH part, if you want to compile with ncurses - and your ncurses is not installed in any of the places configure - checks (/usr/include, /usr/include/ncurses, /usr/local/include and - /usr/local/include/ncurses). The configure script will append - `lib' and `include' to find the libncurses.a and ncurses.h - files respectively. + Use this flag with =PATH part if you want to compile with + ncurses, and your ncurses is not installed in any of the places + configure normally checks. The configure script will append + `lib' and `include' to find the libncurses.a and ncurses.h files + respectively. `--with-gpm-mouse[=PATH]' Use this flag if your GPM mouse package cannot be detected by the @@ -63,7 +61,4 @@ for other people and want to tar the whole binary later, you may want to specify `make install DESTDIR=PATH', which will make PATH the root for installation. -3a. Type `make mcfninstall' to get an interactive program check if you -want to define an useful alias for the Midnight Commander. - 4. Type `mc' and enjoy! diff --git a/configure.in b/configure.in index f445da3eb..5be88997f 100644 --- a/configure.in +++ b/configure.in @@ -728,8 +728,6 @@ lib/mc.ext lib/mc.sh lib/mc.csh -mcfn_install - vfs/extfs/deb vfs/extfs/ftplist vfs/extfs/lslR diff --git a/mcfn_install.in b/mcfn_install.in deleted file mode 100644 index 9cf99c7d1..000000000 --- a/mcfn_install.in +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/sh -# - -prefix=@prefix@ -suppbindir=@prefix@/lib/mc/bin - -do_compat_replace () { - cp $1 $1.orig - if test "$?" != "0"; then - echo "Command \`cp $1 $1.orig' failed. File $1 not changed!" - return 1 - fi - sed '/^mc ()/ { - # Add comment - i\ -#Commented out by mc_fninstall. Source @prefix@/lib/mc/bin/mc.sh instead. -} - -/^mc ()[^}]*$/,/}[; ]*$/{ - # Function definition over several lines - s/^\(.*\)$/#\1/g -} - -/^mc ().*}.*$/{ - # Function definition on one line - s/^\(.*\)$/#\1/g -}' < $1.orig > $1 - - echo >> $1 - echo ". $suppbindir/mc.sh" >> $1 - echo "" - echo "I commented out the mc () function definitions in $1 and added" - echo "\`. $suppbindir/mc.sh'. Your previous profile has been saved as" - echo "$1.orig." -} - -if test -n `echo $prefix | grep prefix`; then - prefix=/usr/local -fi -if test x$BASH = x; then - BASHRC= -else - BASHRC=~/.bashrc -fi -if test "x$EUID" = x0; then - PROFILE=/etc/profile -else - PROFILE=~/.profile -fi -if test -f $PROFILE; then - A=`grep "mc ()" $PROFILE` - B= - if test -n "$BASHRC"; then - if test -f $BASHRC; then - B=`grep "mc ()" $BASHRC` - fi - fi - - if test -n "$A" -o -n "$B"; then - if test -n "$B"; then - echo "While examining your $PROFILE and $BASHRC," - else - echo "While examining your $PROFILE," - fi - echo "I've found that you have a probably outdated mc () function definition" - echo "there. Do you want to replace this function definition with " - echo " . $suppbindir/mc.sh" - read rep - case $rep in - [Yy]*) ;; - *) exit ;; - esac - if test -n "$A"; then - do_compat_replace $PROFILE - fi - if test -n "$B"; then - do_compat_replace $BASHRC - fi - - exit 0 - fi - unset -f do_compat_replace - - # This doesn't handle the case that $prefix changed - A=`grep "/mc.sh" $PROFILE` - B= - if test -n "$BASHRC"; then - if test -f $BASHRC; then - B=`grep "/mc.sh" $BASHRC` - fi - fi - if test -n "$A"; then - : - else - if test -n "$B"; then - : - else - A=`typeset -f | grep "mc ()" 2>/dev/null` - if test ! -n "$A"; then - echo "mc () installation." - if test -n "$BASHRC"; then - echo "While examining your $PROFILE and $BASHRC," - else - echo "While examining your $PROFILE," - fi - echo "I've found that you do not source $suppbindir/mc.sh there." - echo "This shell script defines a function which enables a feature of mc(1)" - echo "that when you leave mc(1), you return to a directory where you were" - echo "in mc just before exiting and not to the directory you've started mc" - echo "from." - echo "Would you like to append" - echo "test -f $suppbindir/mc.sh && . $suppbindir/mc.sh" - if test -n "$BASHRC"; then - echo "to your (p) $PROFILE (mc function will be active in your login shells)" - echo -n "or to your (b) $BASHRC (in every bash instance) or (n) no? [p|b|n] " - else - echo -n "function to your $PROFILE? [y|n] " - fi - read rep - if test -n "$BASHRC"; then - INITFILE=$BASHRC - else - INITFILE=$PROFILE - fi - case $rep in - [Yy]*) ;; - [Pp]*) INITFILE=$PROFILE ;; - *) exit 1;; - esac - echo >>$INITFILE - echo 'test -f $suppbindir/mc.sh && . $suppbindir/mc.sh' >>$INITFILE - echo "mc () function appended to your $INITFILE" - fi - fi - fi -fi