$NetBSD: patch-af,v 1.3 2003/10/30 15:43:07 agc Exp $

--- makeinclude.in.orig	Sat Apr 14 07:11:43 2001
+++ makeinclude.in
@@ -39,8 +39,8 @@
 NROFF		=@NROFF@
 
 # compiler names:
-CXX		=@CXX@
-CC		=@CC@
+CXX		=$(LIBTOOL) c++
+CC		=$(LIBTOOL) @CC@
 MAKEDEPEND	=@MAKEDEPEND@
 
 # flags for C++ compiler:
@@ -49,15 +49,26 @@
 
 # program to make the archive:
 LIBNAME		=@LIBNAME@
+LIBRARY		=@LIBRARY@
+LIBFLTK		=@LIBFLTK@
+LINKFLTK	=@LINKFLTK@
 LIBCOMMAND	=@LIBCOMMAND@
+LIBTOOL		=@LIBTOOL@
 RANLIB		=@RANLIB@
 DSONAME		=@DSONAME@
 DSOCOMMAND	=@DSOCOMMAND@
 
 # libraries to link with:
-LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
+#LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
+LDLIBS		=$(GLDLIBS)
 GLDLIBS		=@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
 
+# installation programs:
+INSTALL_BIN	=$(LIBTOOL) cp
+INSTALL_DATA	=cp
+INSTALL_LIB	=$(LIBTOOL) cp
+INSTALL_MAN	=cp
+
 # Man page extensions...
 CAT1EXT		=@CAT1EXT@
 CAT3EXT		=@CAT3EXT@
@@ -70,7 +81,7 @@
 
 .cxx:
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
 
 .c.o:
 	echo Compiling $@...