Mercurial > hg > octave-lyh
changeset 3077:bb05bfa835c9
[project @ 1997-08-03 20:36:49 by jwe]
author | jwe |
---|---|
date | Sun, 03 Aug 1997 20:36:50 +0000 |
parents | 440a0e1b8c66 |
children | 5e4b19abfeb1 |
files | Makefile.in configure.in install-octave octMakefile.in |
diffstat | 4 files changed, 6 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in +++ b/Makefile.in @@ -6,7 +6,7 @@ # University of Wisconsin-Madison # Department of Chemical Engineering -TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea info dlfcn \ +TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \ src scripts doc check octave.info INSTALL.OCTAVE BUGS \ install install-strip uninstall tags TAGS dist conf-dist \ snapshot snapshot-version @@ -90,7 +90,6 @@ @echo "" @echo " dlfcn make all in subdirectory dlfcn" @echo " doc make all in subdirectory doc" - @echo " info make all in subdirectory info" @echo " kpathsea make all in subdirectory kpathsea" @echo " libcruft make all in subdirectory libcruft" @echo " liboctave make all in subdirectory liboctave"
--- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA ### 02111-1307, USA. -AC_REVISION($Revision: 1.282 $) +AC_REVISION($Revision: 1.283 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -120,19 +120,6 @@ ;; esac -INFO_DIR=info - -AC_ARG_ENABLE(info, - [ --enable-info use GNU info (default is yes)], - [if test "$enableval" = no; then - USE_GNU_INFO=false; - INFO_DIR=""; - fi], []) -if $USE_GNU_INFO; then - AC_DEFINE(USE_GNU_INFO, 1) -fi -AC_SUBST(INFO_DIR) - dnl ### Allow the user disable support for plplot. dnl dnl # USE_PLPLOT=true @@ -1183,7 +1170,7 @@ export CXX export F77 -AC_CONFIG_SUBDIRS(glob kpathsea scripts $INFO_DIR $PLPLOT_DIR $READLINE_DIR) +AC_CONFIG_SUBDIRS(glob kpathsea scripts $PLPLOT_DIR $READLINE_DIR) ### Do the substitutions in all the Makefiles.
--- a/install-octave +++ b/install-octave @@ -210,10 +210,6 @@ cp octave-bug $bindir/octave-bug chmod 755 $bindir/octave-bug -echo "installing info as $archlibdir/info" -cp info/info $archlibdir/info -chmod 755 $archlibdir/info - if test -f LIBRARIES; then echo "installing shared libraries in $libdir" for f in `cat LIBRARIES`
--- a/octMakefile.in +++ b/octMakefile.in @@ -45,7 +45,7 @@ CONF_DISTSUBDIRS = src # Subdirectories in which to run `make dist'. -DISTSUBDIRS = libcruft liboctave info dlfcn src scripts \ +DISTSUBDIRS = libcruft liboctave dlfcn src scripts \ test doc emacs examples XBINDISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \ @@ -57,7 +57,7 @@ octave-bug config.status config.h VERSION ARCH # Subdirectories in which to run `make bin-dist'. -BINDISTSUBDIRS = libcruft liboctave src info scripts doc emacs examples +BINDISTSUBDIRS = libcruft liboctave src scripts doc emacs examples # Subdirectories in which to run clean targets. CLEANSUBDIRS = $(DISTSUBDIRS) glob kpathsea @@ -243,7 +243,7 @@ find `cat .fname` \( -perm 766 -o -perm 676 -o -perm 667 \ -o -perm 776 -o -perm 677 -o -perm 767 \) -print | \ xargs chmod a+x scripts - strip src/octave info/info + strip src/octave tar cf `cat .fname`.tar `cat .fname` rm -rf `cat .fname` gzip --best `cat .fname`.tar