diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2004-09-17 09:35:38 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2004-09-17 09:35:38 +0000 |
| commit | a2c0a341e6b64345e17f13d2be423d8b607bb3c9 (patch) | |
| tree | bd9f7764512f13f33a27a108f81e6816b0bad6b5 /net-im/silc-toolkit | |
| parent | Stable on alpha, bug 64166. (Manifest recommit) (diff) | |
| download | gentoo-2-a2c0a341e6b64345e17f13d2be423d8b607bb3c9.tar.gz gentoo-2-a2c0a341e6b64345e17f13d2be423d8b607bb3c9.tar.bz2 gentoo-2-a2c0a341e6b64345e17f13d2be423d8b607bb3c9.zip | |
Use sed-fu also on Makefile.am. Closes bug #63089.
Diffstat (limited to 'net-im/silc-toolkit')
| -rw-r--r-- | net-im/silc-toolkit/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog index 4c48ffd2608d..7b97a6dbf841 100644 --- a/net-im/silc-toolkit/ChangeLog +++ b/net-im/silc-toolkit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/silc-toolkit # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.26 2004/09/05 12:04:46 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.27 2004/09/17 09:35:38 ticho Exp $ + + 17 Sep 2004; Andrej Kacian <ticho@gentoo.org> silc-toolkit-0.9.12-r3.ebuild: + Modify install location of tutorial files also in Makefile.am, since on some + systems (amd64 reported this so far), the build process seems to start over + and recreate Makefile .in from .am. Thanks to Jocelyn Mayer + <l_indien@magic.fr> for the report and following fix (bug #63089). *silc-toolkit-0.9.12-r3 (05 Sep 2004) diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild index 8a2b3cb8ec77..2b87f6d70682 100644 --- a/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild +++ b/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild,v 1.3 2004/09/05 12:04:46 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild,v 1.4 2004/09/17 09:35:38 ticho Exp $ inherit eutils flag-o-matic @@ -21,8 +21,15 @@ src_unpack() { cd ${S} sed -i \ - -e 's:-cp -R $(srcdir)/tutorial $(prefix):-cp -R $(srcdir)/tutorial $(docdir):' \ + -e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \ Makefile.in + + # also modify Makefile.am, since the build process seems to recreate + # Makefile.in and start over (see bug 63089) + sed -i \ + -e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \ + Makefile.am + sed -i \ -e "s:-g -O2:${CFLAGS}:g" \ configure |