summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-05-12 10:35:32 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-05-12 10:35:32 +0000
commitd22ff1badd9958a4462752a3fe75ecb1faa74d05 (patch)
treec64a331010ad7930516f5562e1cbb54ae1edc266 /eclass/qt4.eclass
parentadd fix for http://security.freebsd.org/advisories/FreeBSD-SA-09:07.libc.asc (diff)
downloadgentoo-2-d22ff1badd9958a4462752a3fe75ecb1faa74d05.tar.gz
gentoo-2-d22ff1badd9958a4462752a3fe75ecb1faa74d05.tar.bz2
gentoo-2-d22ff1badd9958a4462752a3fe75ecb1faa74d05.zip
Minor fix on eclass
Diffstat (limited to 'eclass/qt4.eclass')
-rw-r--r--eclass/qt4.eclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass
index d9aa3f32e092..5a3c02497424 100644
--- a/eclass/qt4.eclass
+++ b/eclass/qt4.eclass
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.54 2009/05/09 14:59:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.55 2009/05/12 10:35:32 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -272,8 +272,9 @@ eqmake4() {
printf "CONFIG += %s\n", add >> file;
print fixed;
}'
- local file=
- while read file; do
+ local filepath=
+ while read filepath; do
+ local file="${filepath#./}"
grep -q '^### eqmake4 was here ###$' "${file}" && continue
local retval=$({
rm -f "${file}" || echo "FAILED"
@@ -285,7 +286,7 @@ eqmake4() {
eerror " An error occurred while processing ${file}"
die "eqmake4 failed to process '${file}'."
fi
- done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" -printf '%P\n' 2>/dev/null)
+ done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" 2>/dev/null)
/usr/bin/qmake -makefile -nocache \
QTDIR=/usr/$(get_libdir) \