Mercurial > hg > octave-lojdl
changeset 15414:494f9bac8862
build: Rename autogen.sh script to bootstrap to conform to GNU guidelines.
* bootstrap: renamed from autogen.sh.
* autogen.sh: deleted.
* build-aux/bootstrap_gnulib: renamed from bootstrap.
* build-aux/bootstrap: deleted.
* build-aux/bootstrap_gnulib.conf: renamed from bootstrap.conf.
* build-aux/bootstrap.conf: deleted.
* Makefile.am: add bootstrap and bootstrap_gnulib to EXTRA_DIST.
* contrib.txi, HACKING, README.MacOS, README.MinGW, mx-ops, sparse-mx-ops,
vx-ops: Replace references to autogen.sh with bootstrap.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 18 Sep 2012 15:32:50 -0700 |
| parents | 3dcd96e1f657 |
| children | 15c435992d3c |
| files | Makefile.am autogen.sh bootstrap build-aux/bootstrap build-aux/bootstrap.conf build-aux/bootstrap_gnulib build-aux/bootstrap_gnulib.conf doc/interpreter/contrib.txi etc/HACKING etc/README.MacOS etc/README.MinGW liboctave/operators/mx-ops liboctave/operators/sparse-mx-ops liboctave/operators/vx-ops |
| diffstat | 11 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am +++ b/Makefile.am @@ -37,8 +37,8 @@ INSTALL.OCTAVE \ NEWS \ README \ - autogen.sh \ - build-aux/bootstrap \ + bootstrap \ + build-aux/bootstrap_gnulib \ build-aux/bootstrap.conf \ build-aux/mk-opts.pl \ build-aux/mkinstalldirs \
rename from autogen.sh rename to bootstrap --- a/autogen.sh +++ b/bootstrap @@ -1,5 +1,5 @@ #! /bin/sh -# autogen.sh +# bootstrap # Run this to generate all the initial makefiles, etc. set -e @@ -36,7 +36,7 @@ echo "bootstrapping..." -build-aux/bootstrap "$@" +build-aux/bootstrap_gnulib "$@" ## G77 is obsolete, but it is still the first option in the autoconf Fortran ## macros. We should avoid it, because mixing old versions of g77 with modern
--- a/doc/interpreter/contrib.txi +++ b/doc/interpreter/contrib.txi @@ -82,7 +82,7 @@ Generate the necessary configuration files: @example -./autogen.sh +./bootstrap @end example @item
--- a/etc/HACKING +++ b/etc/HACKING @@ -43,9 +43,9 @@ http://www.gnu.org/software/octave/download.html -After cloning Octave, you will need to run the autogen.sh script: +After cloning Octave, you will need to run the bootstrap script: - $ ./autogen.sh + $ ./bootstrap This script will examine the source tree and generate some Makefile fragments and then runs the bootstrap script. The bootstrap script comes @@ -70,10 +70,10 @@ corresponding Mercurial revision if you update the working directory to a past revision not too far in the past. -Additional options besides --gnulib-srcdir can be passed to autogen.sh and -they will be forwarded without modification to the bootstrap script. +Additional options besides --gnulib-srcdir can be passed to bootstrap and +they will be forwarded without modification to the gnulib bootstrap script. -Once the autogen.sh and bootstrap scripts complete successfully, you may +Once the bootstrap and bootstrap_gnulib scripts complete successfully, you may run $ ./configure @@ -115,8 +115,8 @@ libgnu -- gnulib sources that we use. The files here are copied here from the gnulib directory by the - build-aux/bootstrap script that is run by the - autogen.sh script. + build-aux/bootstrap_gnulib script that is run by the + bootstrap script. liboctave -- C++ interfaces to the numerical libraries, Fortran
--- a/etc/README.MacOS +++ b/etc/README.MacOS @@ -270,8 +270,8 @@ After installing each of the dependencies, the sources are compiled by setting the proper environment variables and then following the standard build sequence. The following is an example set of variables for a 32-bit build -using gcc-4.2. When building from the sources obtained from the mercurial -archive, ./autogen.sh must be run prior to ./configure. +using gcc-4.2. When building from the sources obtained from the Mercurial +archive, ./bootstrap must be run prior to ./configure. export FINK_PREFIX="/sw" export PREFIX="/usr/local/bin" @@ -385,7 +385,7 @@ Octave may now be built from a local mercurial archive by typing the commands below (these assume gcc-4.4 is installed by macports). - ./autogen.sh + ./bootstrap export PREFIX=/opt/local export CC=/opt/local/bin/gcc-mp-4.4 export CXX=/opt/local/bin/g++-mp-4.4
--- a/etc/README.MinGW +++ b/etc/README.MinGW @@ -94,7 +94,7 @@ http://thread.gmane.org/gmane.comp.gnu.octave.bugs/12361/focus=12404 To build development sources from the Mercurial repository you must run - 'autogen.sh' (bootstrap) before running configure and make. This requires + bootstrap before running configure and make. This requires that automake and autoconf tools be installed.
--- a/liboctave/operators/mx-ops +++ b/liboctave/operators/mx-ops @@ -16,7 +16,7 @@ # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>. -# NOTE: if this file changes, you must run autogen.sh and configure to +# NOTE: if this file changes, you must run bootstrap and configure to # rebuild the source file lists for Make. # types
--- a/liboctave/operators/sparse-mx-ops +++ b/liboctave/operators/sparse-mx-ops @@ -16,7 +16,7 @@ # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>. -# NOTE: if this file changes, you must run autogen.sh and configure to +# NOTE: if this file changes, you must run bootstrap and configure to # rebuild the source file lists for Make. # types
--- a/liboctave/operators/vx-ops +++ b/liboctave/operators/vx-ops @@ -16,7 +16,7 @@ # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>. -# NOTE: if this file changes, you must run autogen.sh and configure to +# NOTE: if this file changes, you must run bootstrap and configure to # rebuild the source file lists for Make. # types