$NetBSD: patch-af,v 1.7 2006/01/22 11:11:34 wiz Exp $

--- makeinclude.in.orig	2006-01-15 18:36:16.000000000 +0000
+++ makeinclude.in
@@ -49,8 +49,8 @@ SHELL		= /bin/sh
 STRIP		= strip
 
 # compiler names:
-CXX		= @CXX@
-CC		= @CC@
+CXX		= $(LIBTOOL) @CXX@
+CC		= $(LIBTOOL) @CC@
 MAKEDEPEND	= @MAKEDEPEND@
 
 # flags for C++ compiler:
@@ -60,6 +60,7 @@ CXXFLAGS	= $(OPTIM) @LARGEFILE@ @CPPFLAG
 
 # program to make the archive:
 LIBNAME		= @LIBNAME@
+LIBTOOL		= @LIBTOOL@
 FLLIBNAME	= @FLLIBNAME@
 GLLIBNAME	= @GLLIBNAME@
 IMGLIBNAME	= @IMGLIBNAME@
@@ -74,7 +75,8 @@ DSOCOMMAND	= @DSOCOMMAND@
 
 # libraries to link with:
 AUDIOLIBS	= @AUDIOLIBS@
-LDLIBS		= @LDFLAGS@ @LIBS@
+#LDLIBS		= @LDFLAGS@ @LIBS@
+LDLIBS		= $(GLDLIBS)
 GLDLIBS		= @LDFLAGS@ @GLLIB@ @LIBS@
 LINKFLTK	= @LINKFLTK@
 LINKFLTKGL	= @LINKFLTKGL@
@@ -86,6 +88,12 @@ IMAGELIBS	= -L../lib @IMAGELIBS@
 # image libraries to build...
 IMAGEDIRS	= @JPEG@ @ZLIB@ @PNG@
 
+# installation programs:
+INSTALL_BIN	=$(LIBTOOL) cp
+INSTALL_DATA	=cp
+INSTALL_LIB	=$(LIBTOOL) cp
+INSTALL_MAN	=cp
+
 # The extension to use for executables...
 EXEEXT		= @EXEEXT@
 
@@ -114,7 +122,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
 .SILENT:
 
 # Build commands and filename extensions...
-.SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
+.SUFFIXES:	.0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
 
 .o$(EXEEXT):
 	echo Linking $@...
@@ -129,7 +137,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
 	echo Compiling $<...
 	$(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
 
-.man.0 .man.1 .man.3:
+.man.0 .man.1 .man.3 .man.6:
 	echo Formatting $<...
 	rm -f $@
 	$(NROFF) -man $< >$@