diff -urN ../dap-2.1.1.orig/main/Makefile.linux ./main/Makefile.linux
--- ../dap-2.1.1.orig/main/Makefile.linux	Thu May 25 17:52:37 2000
+++ ./main/Makefile.linux	Sun Jun 11 13:51:02 2000
@@ -1,5 +1,5 @@
-CC      = gcc
-CXX     = g++
+CC      ?= gcc
+CXX     ?= g++
 FORMS   = ../../xforms/FORMS
 SOUND   = ../sound
 SPKIT   = ../spkit
@@ -11,10 +11,10 @@
 X11DIR  = /usr/X11R6
 INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include
 LIBDIR  = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -DSIGNALWORKAROUND -Wall -Wno-unused
+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 DEBUG   = -g3
-OPTIM   = -O1
-LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
+OPTIM   = ${CXXFLAGS}
+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lxforms -lXpm -lX11 -lm
 
 PROGS =	DAP
 OBJS  = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \