force building of static library instead of cloning libXaw installation, really pick up our compiler

xaw3d/xaw3d.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      1.5
-Release:      20030807
+Release:      20030808
 
 #   list of sources
 Source0:      ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
@@ -56,6 +56,10 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;^\(#ifdef HAS_WCTYPE_H\)$;\1_DO_NOT_USE;' \
         xc/lib/Xaw3d/XawI18n.h
+    %{l_shtool} subst \
+        -e 's;NormalLibXaw;YES;' \
+        -e 's;SharedLibXaw;NO;' \
+        xc/lib/Xaw3d/Imakefile
 
 %build
     cd xc/lib/Xaw3d/
@@ -65,9 +69,10 @@ AutoReqProv:  no
     #   xmkmf -a
     x11config=`%{l_prefix}/etc/rc --query x11_libdir`/X11/config
     imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11config
-    %{l_make} Makefiles
+    %{l_make} Makefiles IMAKE_DEFINES="-DHasGcc2 -UHasSunC"
     %{l_make} includes
-    %{l_make} EXTRA_DEFINES="-DARROW_SCROLLBAR -DUSEGRAY" EXTRA_INCLUDES="-I."
+    %{l_make} CC="%{l_cc}" \
+        EXTRA_DEFINES="-DARROW_SCROLLBAR -DUSEGRAY" EXTRA_INCLUDES="-I."
 
 %install
     rm -rf $RPM_BUILD_ROOT