$NetBSD: patch-af,v 1.6 2004/10/21 08:29:45 adam Exp $ --- makeinclude.in.orig 2004-10-18 20:22:21.000000000 +0000 +++ makeinclude.in @@ -46,8 +46,8 @@ SHELL = /bin/sh STRIP = strip # compiler names: -CXX = @CXX@ -CC = @CC@ +CXX = $(LIBTOOL) @CXX@ +CC = $(LIBTOOL) @CC@ MAKEDEPEND = @MAKEDEPEND@ # flags for C++ compiler: @@ -57,6 +57,7 @@ CXXFLAGS = $(OPTIM) @CPPFLAGS@ @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@ @@ -82,6 +84,12 @@ IMAGELIBS = @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@