diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2013-04-08 08:11:29 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2013-04-08 08:11:29 +0000 |
| commit | 503c9a1b46346c3f039747da6af1121f133bada7 (patch) | |
| tree | 9aefc136f3bf3e6ff6c48a27096fc0a42939d307 /eclass | |
| parent | Revbump, apply patch to fix segfault issue (bug #465040). Remove old. (diff) | |
| download | historical-503c9a1b46346c3f039747da6af1121f133bada7.tar.gz historical-503c9a1b46346c3f039747da6af1121f133bada7.tar.bz2 historical-503c9a1b46346c3f039747da6af1121f133bada7.zip | |
Fix for installing ini files in the tree. Bug 464900
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/php-ext-source-r2.eclass | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 54e04704a2bc..9279d2a32209 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.776 2013/04/08 03:37:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.777 2013/04/08 08:11:29 olemarkus Exp $ + + 08 Apr 2013; Ole Markus With <olemarkus@gentoo.org> php-ext-source-r2.eclass: + Fix for installing ini files in the tree. Bug 464900 08 Apr 2013; Patrick Lauer <patrick@gentoo.org> toolchain.eclass: Fix for gcc info page installation #464008 diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index efca332efe93..08620303f7c4 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.30 2012/09/27 16:35:41 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.31 2013/04/08 08:11:29 olemarkus Exp $ # @ECLASS: php-ext-source-r2.eclass # @MAINTAINER: @@ -262,13 +262,9 @@ php-ext-source-r2_createinifiles() { local inifile for inifile in ${PHPINIFILELIST} ; do if [[ -n "${PHP_EXT_INIFILE}" ]]; then - cat "${FILESDIR}/${PHP_EXT_INIFILE}" > "${inifile}" + cat "${FILESDIR}/${PHP_EXT_INIFILE}" >> "${ED}/${inifile}" einfo "Added content of ${FILESDIR}/${PHP_EXT_INIFILE} to ${inifile}" fi - - - - inidir="${inifile/${PHP_EXT_NAME}.ini/}" inidir="${inidir/ext/ext-active}" dodir "/${inidir}" |