$NetBSD: patch-af,v 1.5 2004/02/18 05:07:34 ben Exp $ --- makeinclude.in.orig 2003-01-30 13:38:24.000000000 -0800 +++ makeinclude.in @@ -47,8 +47,8 @@ SHELL = /bin/sh STRIP = strip # compiler names: -CXX = @CXX@ -CC = @CC@ +CXX = $(LIBTOOL) @CXX@ +CC = $(LIBTOOL) @CC@ MAKEDEPEND = @MAKEDEPEND@ # flags for C++ compiler: @@ -58,6 +58,7 @@ CXXFLAGS = $(OPTIM) @CXXFLAGS@ # program to make the archive: LIBNAME = @LIBNAME@ +LIBTOOL = @LIBTOOL@ FLLIBNAME = @FLLIBNAME@ GLLIBNAME = @GLLIBNAME@ IMGLIBNAME = @IMGLIBNAME@ @@ -70,7 +71,8 @@ IMGDSONAME = @IMGDSONAME@ DSOCOMMAND = @DSOCOMMAND@ # libraries to link with: -LDLIBS = @LDFLAGS@ @LIBS@ +#LDLIBS = @LDFLAGS@ @LIBS@ +LDLIBS = $(GLDLIBS) GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ LINKFLTK = -L../lib @LINKFLTK@ LINKFLTKGL = -L../lib @LINKFLTKGL@ @@ -79,6 +81,12 @@ LINKFLTKIMG = -L../lib -lfltk_images @LI LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) IMAGELIBS = @IMAGELIBS@ +# installation programs: +INSTALL_BIN =$(LIBTOOL) cp +INSTALL_DATA =cp +INSTALL_LIB =$(LIBTOOL) cp +INSTALL_MAN =cp + # The extension to use for executables... EXEEXT = @EXEEXT@