[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/devtools/waf/wafadmin/Tools
From:       Thomas Nagy <tnagyemail-mail () yahoo ! fr>
Date:       2006-10-03 18:07:00
Message-ID: 1159898820.305124.32340.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 592057 by tnagy:

Include and binary paths for Debian/Kubuntu.


 M  +2 -2      Qt4.py  


--- trunk/playground/devtools/waf/wafadmin/Tools/Qt4.py #592056:592057
@@ -190,7 +190,7 @@
 	if not qtincludes: qtincludes = qtdir + 'include/'
 	env['QTINCLUDEPATH']=qtincludes
 
-	lst = [qtincludes, '/usr/include/qt4', '/opt/qt4/include']
+	lst = [qtincludes, '/usr/share/qt4/include/', '/opt/qt4/include']
         test = conf.create_header_enumerator()
         test.name = 'QtGui/QFont'
 	test.path = lst
@@ -201,7 +201,7 @@
 	# check for the qtbinaries
 	if not qtbin: qtbin = qtdir + 'bin/'
 
-	binpath = [qtbin] + os.environ['PATH'].split(':')
+	binpath = [qtbin, '/usr/share/qt4/bin/'] + os.environ['PATH'].split(':')
 	def find_bin(lst, var):
 		for f in lst:
 			ret = conf.find_program(f, path_list=binpath)
[prev in list] [next in list] [prev in thread] [next in thread]