[gentoo-commits] gentoo-x86 commit in eclass: qt4-r2.eclass

[Davide Pesavento (pesa)]

pesa        11/12/28 10:57:38

  Modified:             qt4-r2.eclass
  Log:
  Fix regression with DOCS and non-default ${S}, bug #396227.

Revision  Changes    Path
1.16                 eclass/qt4-r2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.15&r2=1.16

Index: qt4-r2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4-r2.eclass	26 Dec 2011 11:47:47 -0000	1.15
+++ qt4-r2.eclass	28 Dec 2011 10:57:38 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.15 2011/12/26 11:47:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.16 2011/12/28 10:57:38 pesa Exp $
 
 # @ECLASS: qt4-r2.eclass
 # @MAINTAINER:
@@ -128,7 +128,6 @@
 # @ECLASS-VARIABLE: DOCSDIR
 # @DESCRIPTION:
 # Directory containing documentation, defaults to ${S}.
-DOCSDIR="${DOCSDIR:-${S}}"
 
 # @FUNCTION: qt4-r2_src_install
 # @DESCRIPTION:
@@ -140,9 +139,9 @@
 	emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "emake install failed"
 
 	# install documentation
-	local doc
+	local doc dir="${DOCSDIR:-${S}}"
 	for doc in ${DOCS}; do
-		dodoc "${DOCSDIR}/${doc}" || die "dodoc failed"
+		dodoc "${dir}/${doc}" || die "dodoc failed"
 	done
 }