--- a/Make.include.in	2003-04-17 06:02:52.000000000 +0100
+++ b/Make.include.in	2003-11-18 18:36:36.000000000 +0000
@@ -5,8 +5,9 @@
 GL_LIBS = @GL_LIBS@
 OPT_LIBS = @OPT_LIBS@
 
-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
-LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
+override CFLAGS += -Wall -I../libgfx/include/ $(SDL_CFLAGS)
+override CXXFLAGS += -Wall -I../libgfx/include/ $(SDL_CFLAGS)
+override LIBS += ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS)
 
 OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
 PROGRAM = @PROGRAM@