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 | 403ab0849199aebb1239b26f739c392205501f04 (patch) | |
| tree | 2f870cce5ec4fe748391aeff291f7fff96c3dffb /net-im/silc-toolkit | |
| parent | Stable on alpha, bug 64166. (diff) | |
| download | historical-403ab0849199aebb1239b26f739c392205501f04.tar.gz historical-403ab0849199aebb1239b26f739c392205501f04.tar.bz2 historical-403ab0849199aebb1239b26f739c392205501f04.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/Manifest | 10 | ||||
| -rw-r--r-- | net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild | 11 |
3 files changed, 21 insertions, 8 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/Manifest b/net-im/silc-toolkit/Manifest index c8a25672a211..7a587e2f588c 100644 --- a/net-im/silc-toolkit/Manifest +++ b/net-im/silc-toolkit/Manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 b2e6b6d53f55e360de498926dc3a8a2e ChangeLog 4025 -MD5 3abc19103b2f36417fba2a882dcc3361 silc-toolkit-0.9.12-r3.ebuild 1948 +MD5 e59fe441d9c4ce493ae5dd63c43c2deb ChangeLog 4393 +MD5 50b090a040cf1911f92ccb05f969d964 silc-toolkit-0.9.12-r3.ebuild 2154 MD5 9a5e70dcc2b8cf19a19eb000d52e022d silc-toolkit-0.9.12-r2.ebuild 1598 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r2 73 @@ -11,7 +11,7 @@ MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r3 73 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBOwDn10xuJSrg3/sRAoNRAJ9RC8Ep8FKVCe4Ya0w3lbhyGevnkACeIPjh -KcufOiE8P/p+mMALTBUjJQ8= -=QWuM +iD8DBQFBSq/010xuJSrg3/sRAgisAJ47B3OeSGC8FmLIq7e8ChkGRqP/LwCfcwrW +Kjzd2qDubjZRBJ37fD8Gedk= +=7ePp -----END PGP SIGNATURE----- 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 |