diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-10-20 10:43:04 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-10-20 10:43:04 +0000 |
| commit | 555e75c142c2358e0c84ddc7e45fcdc5a212a0ce (patch) | |
| tree | 341d4e76233d76840b4748ae52517f980aaf6a85 | |
| parent | New upstream versions. (diff) | |
| download | historical-555e75c142c2358e0c84ddc7e45fcdc5a212a0ce.tar.gz historical-555e75c142c2358e0c84ddc7e45fcdc5a212a0ce.tar.bz2 historical-555e75c142c2358e0c84ddc7e45fcdc5a212a0ce.zip | |
tab fixes
| -rw-r--r-- | eclass/autotools.eclass | 16 | ||||
| -rw-r--r-- | eclass/libtool.eclass | 22 |
2 files changed, 19 insertions, 19 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index a35a0f4a55ea..4360771867b1 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.4 2002/07/26 21:50:14 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.5 2002/10/20 10:43:04 azarah Exp $ # The autotools eclass enables building of the apps that needs the latest autconf/automake. # # NOTES: @@ -22,7 +22,7 @@ # # Copyright 1999-2002 Gentoo Technologies, Inc. # # Distributed under the terms of the GNU General Public License, v2 or later # # Maintainer: John Doe <john@foo.com> -# # $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.4 2002/07/26 21:50:14 danarmak Exp $ +# # $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.5 2002/10/20 10:43:04 azarah Exp $ # # # If you need to set the versions different from in here, it *must* # # be done before inherit.eclass is sourced @@ -163,14 +163,14 @@ install_automake() { cd ${AUTO_S}/automake-${AMAKEVER} || die "!!! Failed to build automake !!!" - ./configure --prefix=${AUTO_D} \ - --infodir=${AUTO_D}/share/info \ - --mandir=${AUTO_D}/share/man \ - --target=${CHOST} || die "!!! Failed to configure automake !!!" + ./configure --prefix=${AUTO_D} \ + --infodir=${AUTO_D}/share/info \ + --mandir=${AUTO_D}/share/man \ + --target=${CHOST} || die "!!! Failed to configure automake !!!" - emake || die "!!! Failed to build automake !!!" + emake || die "!!! Failed to build automake !!!" - make install || die "!!! Failed to install automake !!!" + make install || die "!!! Failed to install automake !!!" } install_autotools() { diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index aea41c218017..8ef1ddc59003 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -2,7 +2,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.13 2002/08/29 23:56:15 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.14 2002/10/20 10:43:04 azarah Exp $ # This eclass patches ltmain.sh distributed with libtoolized packages with the # relink and portage patch ECLASS=libtool @@ -386,18 +386,18 @@ relink_patch() { ENDPATCH - retval=$? + retval=$? - # This one dont apply clean to libtool-1.4.2a, so do it manually. - if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ] - then - cp ltmain.sh ltmain.sh.orig - sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \ - ltmain.sh.orig > ltmain.sh - rm -f ltmain.sh.orig - fi + # This one dont apply clean to libtool-1.4.2a, so do it manually. + if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ] + then + cp ltmain.sh ltmain.sh.orig + sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \ + ltmain.sh.orig > ltmain.sh + rm -f ltmain.sh.orig + fi - return ${retval} + return ${retval} } tmp_patch() { |