PATCH Trivial fix for xconfig

PATCH Trivial fix for xconfig

[Chris Lingard]

All versions of Linux 2-6

When qt is installed in /usr, then there is no need to set and
export QTDIR; but make xconfig expects this.

This patch adds /usr to the script, and removes two header search
paths that would need QTDIR set.

diff -Naur linux-2.6.7.old/scripts/kconfig/Makefile 
linux-2.6.7/scripts/kconfig/Makefile
--- linux-2.6.7.old/scripts/kconfig/Makefile    2004-04-05 18:19:04.000000000 
+0100
+++ linux-2.6.7/scripts/kconfig/Makefile        2004-07-19 13:35:28.914128104 
+0100
@@ -112,7 +112,7 @@

 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
-       @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+       @set -e; for d in $$QTDIR /usr; do \
          if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
        done; \
        if [ -z "$$DIR" ]; then \

Signed off Chris Lingard chris@ukpost.com

Re: PATCH Trivial fix for xconfig

[Roman Zippel]

Hi,

On Mon, 19 Jul 2004, Chris Lingard wrote:

> When qt is installed in /usr, then there is no need to set and
> export QTDIR; but make xconfig expects this.

What distribution are you using? This would mean all qt header files are 
directly in /usr/include.

> This patch adds /usr to the script, and removes two header search
> paths that would need QTDIR set.

You just broke xconfig for Debian and RH systems.

bye, Roman

Re: PATCH Trivial fix for xconfig

[Chris Lingard]

On Monday 19 July 2004 15:09, Roman Zippel wrote:
> Hi,
>
> On Mon, 19 Jul 2004, Chris Lingard wrote:
> > When qt is installed in /usr, then there is no need to set and
> > export QTDIR; but make xconfig expects this.
>
> What distribution are you using? This would mean all qt header files are
> directly in /usr/include.

Thank you for your prompt reply.

RedHat or Linux from Scratch.  Used to install qt in /opt/qt-version
but now put qt, KDE, kitchen sink in /usr.  So all the headers do
go in /usr/include :-)

> You just broke xconfig for Debian and RH systems.

My RedHat system has QTDIR=/usr/lib/qt-3.1 in the environment,
(this was set up by the distro, and is not a hack by me).

Sorry I do not know about Debian.

My Linux from Scratch system never has QTDIR set because everything
is in /usr.

Chris Lingard