--- Makefile.orig	2005-08-08 00:18:41 UTC
+++ Makefile
@@ -22,7 +22,7 @@
 #                    (Note that this is unable to delete the dumbask
 #                    executable if the configuration is absent.)
 
-MAKEFILE = Makefile.rdy
+MAKEFILE = Makefile
 
 .PHONY: all install uninstall clean veryclean distclean config config-if-necessary make-outdirs
 
@@ -36,12 +36,12 @@ PHONY_TARGETS := core allegro core-examp
 COMMA := ,
 
 ifdef USE_ICC
-CC := icc
+CC ?= icc
 else
 ifdef USE_SGICC
-CC := cc
+CC ?= cc
 else
-CC := gcc
+CC ?= gcc
 endif
 endif
 AR := ar
@@ -215,24 +215,21 @@ make-outdirs:
 ifdef USE_ICC
 WFLAGS := -Wall -DDUMB_DECLARE_DEPRECATED
 WFLAGS_ALLEGRO :=
-OFLAGS := -O2
-DBGFLAGS := -DDEBUGMODE=1
+OFLAGS=$(CFLAGS)
 else
 ifdef USE_SGICC
 WFLAGS := -fullwarn -DDUMB_DECLARE_DEPRECATED
 WFLAGS_ALLEGRO :=
-OFLAGS := -n32 -O2 -use_readonly_const
-DBGFLAGS := -n32 -g3 -DDEBUGMODE=1
+OFLAGS=$(CFLAGS)
 else
 WFLAGS := -Wall -W -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations -DDUMB_DECLARE_DEPRECATED
 WFLAGS_ALLEGRO := -Wno-missing-declarations
-OFLAGS := -O2 -ffast-math -fomit-frame-pointer
-DBGFLAGS := -DDEBUGMODE=1 -g3
+OFLAGS=$(CFLAGS)
 endif
 endif
 
-CFLAGS_RELEASE := -Iinclude $(WFLAGS) $(OFLAGS)
-CFLAGS_DEBUG := -Iinclude $(WFLAGS) $(DBGFLAGS)
+CFLAGS_RELEASE := -Iinclude -I$(PREFIX)/include $(_PORT_ALLEGRO_CFLAGS) $(WFLAGS) $(OFLAGS) 
+CFLAGS_DEBUG := -Iinclude -I$(PREFIX)/include $(_PORT_ALLEGRO_CFLAGS) $(WFLAGS) $(DBGFLAGS)
 
 LDFLAGS := -s
 
@@ -251,8 +248,8 @@ CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumb
 ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
 
 
-core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
-allegro: $(ALLEGRO_LIB_FILE_RELEASE) $(ALLEGRO_LIB_FILE_DEBUG)
+core: $(CORE_LIB_FILE_RELEASE)
+allegro: $(ALLEGRO_LIB_FILE_RELEASE)
 
 core-examples: $(CORE_EXAMPLES_EXE)
 allegro-examples: $(ALLEGRO_EXAMPLES_EXE)
@@ -263,11 +260,9 @@ allegro-headers:
 
 install-core: core
 	$(call COPY,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
-	$(call COPY,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
 
 install-allegro: allegro
 	$(call COPY,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
-	$(call COPY,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
 
 ifeq "$(COMSPEC)" ""
 install-core-examples: core-examples
@@ -321,12 +316,6 @@ CORE_LIB_FILE := $(LIBDIR)/libdumb.a
 ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
 include make/Makefile.inc
 
-OBJDIR := $(OBJDIR_BASE)/debug
-CFLAGS := $(CFLAGS_DEBUG)
-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
-include make/Makefile.inc
-
 
 $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
 	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)