--- Makefile.defs-dist	2003-07-28 12:27:26.000000000 +0200
+++ Makefile.defs	2003-07-30 12:48:06.000000000 +0200
@@ -10,7 +10,7 @@
 # -----------------------------------------------------------------------------
 # installation directories
 
-INSTDIR	= /usr/local
+INSTDIR	= /usr
 
 BINDIR	= $(INSTDIR)/bin
 LIBDIR	= $(INSTDIR)/lib
@@ -62,8 +62,8 @@
 CXX = g++
 LD = gcc
 AR = ar rc
-MAKEDLL_L = ld -E -s -shared -O1
-MAKEDLL_P = ld -E -s -shared -O1
+MAKEDLL_L = g++ -shared -O1
+MAKEDLL_P = g++ -shared -O1
 RANLIB = ranlib
 
 # -----------------------------------------------------------------------------
@@ -150,7 +150,7 @@
 # C++ compiler flags
 
 CXXFLAGS = $(CFLAGS) $(C_FLAGS) -fno-exceptions -fno-rtti		\
-	   -fno-unroll-loops -I/usr/local/FLTK-1.1.0/Linux/include
+	   -fno-unroll-loops `fltk-config --cxxflags`
 # `fltk-config --cxxflags`		try adding this if the compilation of
 #					FLTK widgets stops with error messages
 #					related to not finding include files
@@ -164,8 +164,8 @@
 # source and object files for FLTK widgets
 
 # FLTKLIB = -lfltk -lpthread -lstdc++
-# FLTKLIB = `fltk-config --libs`
-FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a			\
+FLTKLIB = `fltk-config --libs` -lstdc++
+# FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a			\
 	  /usr/local/gcc-3.2.2/lib/libstdc++.a
 # libraries required by widgets.cpp
 #	-lfltk -lpthread -lstdc++		use dynamic libraries
@@ -211,7 +211,7 @@
 #	winFLTK.o and FL_graph.o for `improved' X graphics
 # otherwise leave empty
 
-WINLIBS = -L/usr/X11R6/lib -lX11
+WINLIBS = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 # ;window system libraries
 #	-lX11				for X window calls
 #	-L/usr/lib/X11R4		for HP X11 library, v.4