--- libaudiofile/Makefile.linux.orig	Sun Jul  1 13:45:51 2001
+++ libaudiofile/Makefile.linux	Sun Jul  1 13:46:27 2001
@@ -1,11 +1,11 @@
-CC      = gcc
-CXX     = g++
+CC      ?= gcc
+CXX     ?= g++
 BACKDIR = ../bak/libaudiofile
 HOMEDIR = $(HOME)
 INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 DEBUG   = -g3
-OPTIM   = -O1
+OPTIM   = ${CXXFLAGS}
 
 LIBNAME = libaudiofile.a
 OBJS    = audiofile.o ieee.o macros.o raw.o wav.o