--- build/linux/Makefile.orig Mon Aug 28 15:10:27 2006 +++ build/linux/Makefile Thu Sep 7 00:20:01 2006 @@ -25,13 +25,13 @@ TheGoonies.o TheGooniesApp.o main.o EXE = goonies -INSTDIR = /usr/local/games/$(EXE) -STARTUP = /usr/local/bin/$(EXE) +INSTDIR = ${DATADIR} +STARTUP = ${PREFIX}/bin/$(EXE) DATA = ../graphics ../maps ../sound -CC = c++ -CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` -I/usr/local/include/SDL -I/usr/X11R6/include -LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU +CC ?= c++ +CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${X11BASE}/include +LDFLAGS += `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU RM = rm -f CP = cp -r LN = ln -s