Small modification to respect $(CXX)

Obtained from:	Will's Qt/KDE site.

deskutils/kproject/files/patch-aa

@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Dec 18 13:52:15 1997
-+++ Makefile	Sat May 23 21:08:52 1998
+--- Makefile	Thu Dec 18 07:52:15 1997
++++ Makefile.new	Sat Jan 22 16:57:49 2000
 @@ -1,28 +1,28 @@
  
 -kde_libraries = /opt/kde/lib
@@ -14,10 +14,11 @@
  ############ Autoconf-generated variables  ###################
 -CXXFLAGS= -O2 -Wall -I/opt/kde/include -I/usr/lib/qt/include  -I.. 
 -LDFLAGS	= -s -L/opt/kde/lib -L/usr/lib -L/usr/X11/lib -lkdecore -lkdeui -lqt -lXext -lX11 
+-CXX     = c++
+-MOC   	= /usr/bin/moc
 +CXXFLAGS= -O2 -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include -I$(X11BASE)/include/X11/qt  -I.. 
 +LDFLAGS	= -s -L$(kde_libraries) -L$(qt_libraries) -lkdecore -lkdeui -lqt -lXext -lX11 
- CXX     = c++
--MOC   	= /usr/bin/moc
++CXX     ?= c++
 +MOC   	= $(X11BASE)/bin/moc
  
  install = /usr/bin/install -c
@@ -28,7 +29,7 @@
  INSTALL_DIR_PRIVATE = $(install) -d -m 0700
  
 -prefix = /opt/kde
-+prefix = /usr/local
++prefix = $(PREFIX)
  KDEINC = $(prefix)/include
  BINDIR = $(prefix)/bin
  LIBDIR = $(prefix)/lib

devel/qtarch/files/patch-aa

@@ -39,15 +39,18 @@
  #CFLAGS	= -O2 -fno-strength-reduce -W -Wtemplate-debugging -Wparentheses \
  #	-Wuninitialized -Wchar-subscripts -Wformat -Wtrigraphs -Wcomment \
  #	-Wswitch -Wunused -Wreturn-type -Wimplicit -Wpointer-arith -Wsynth \
-@@ -26,7 +26,7 @@
+@@ -26,9 +26,9 @@
  	bmp/libbmp.a \
  	layout/liblayout.a \
  	pixmap/libpixmap.a \
 -	-lfl -lqt -lstdc++ -ldl -rdynamic
 +	-lfl -lqt -lstdc++ -lX11 -lm -rdynamic
  ARFLAGS	= -crs
- CC	= g++
+-CC	= g++
++CC	= $(CXX)
  AR	= ar
+ FLEX	= flex
+ MAKE	= gmake
 --- bmp/Makefile.orig	Fri Jan 29 04:41:35 1999
 +++ bmp/Makefile	Sat May  8 00:50:27 1999
 @@ -85,7 +85,7 @@
@@ -67,12 +70,14 @@
  
  ifdef BUILD_RELEASE
  CFLAGS = -O2 -fno-strength-reduce -Wall -W -pipe -fPIC
-@@ -6,7 +6,7 @@
+@@ -6,8 +6,8 @@
  CFLAGS = -g -Wall -W -pipe -fPIC
  endif
  
 -LDFLAGS = -g -shared -L$(QTDIR)/lib -L/opt/kde/lib -lqt -lkdecore -lkdeui
+-CC = g++
 +LDFLAGS = -g -shared -L$(X11BASE)/lib -L$(PREFIX)/lib -lqt -lkdecore -lkdeui
- CC = g++
++CC = $(CXX)
  MOC = moc
  QTARCHBIN = ../../qtarch
+