$NetBSD: patch-ac,v 1.4 2008/01/12 21:57:04 joerg Exp $

--- linux.cf.orig	2005-10-21 21:10:27.000000000 +0200
+++ linux.cf
@@ -609,10 +609,10 @@ InstallNamedTargetNoClobber(install,file
 #  if defined (i386Architecture) && ((GccMajorVersion >3) \
    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
 #   ifndef CcCmd
-#    define CcCmd		gcc -m32
+#    define CcCmd		@@PKGSRC_CC@@
 #   endif
 #   ifndef CplusplusCmd
-#    define CplusplusCmd	c++ -m32
+#    define CplusplusCmd	@@PKGSRC_CXX@@
 #   endif
 #  endif
 #  if defined (Ppc64Architecture)
@@ -624,8 +624,8 @@ InstallNamedTargetNoClobber(install,file
 #   endif
 #  endif
 #  ifndef CcCmd
-#   define CcCmd		gcc
-#   define CplusplusCmd		c++
+#   define CcCmd		@@PKGSRC_CC@@
+#   define CplusplusCmd		@@PKGSRC_CXX@@
 #  endif
 #  ifndef AsCmd
 #   define AsCmd		CcCmd -c -x assembler
@@ -779,7 +779,6 @@ InstallNamedTargetNoClobber(install,file
 #define YaccCmd			bison -y
 #define LexCmd			flex -l
 #define HasFlex			YES
-#define LexLib			-lfl
 #define PreProcessCmd		CcCmd -E
 #define PostIncDir		DefaultGccIncludeDir
 #define LdCombineFlags		-r
@@ -853,7 +852,7 @@ InstallNamedTargetNoClobber(install,file
 
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags
-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
+#  define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
 # endif
 # define LinuxMachineDefines	-D__i386__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
@@ -1042,20 +1041,12 @@ InstallNamedTargetNoClobber(install,file
 #endif
 
 
-#define HasGnuMake		YES
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
-	$(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
 #define ArchitectureDefines	-DLINUX_ARCHITECTURE
 
 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #if HaveLib64
-# ifndef LibDirName
-#  define LibDirName		lib64
-# endif
 # ifndef SystemUsrLibDir
 #  define SystemUsrLibDir	/usr/lib64
 # endif