--- Makefile.orig	Wed Mar  8 15:04:42 2006
+++ Makefile	Wed Mar  8 15:04:46 2006
@@ -1,6 +1,6 @@
-CC=gcc
 
-SDLCONFIG=sdl-config
+SDLCONFIG=$(SDL_CONFIG)
+CC?=gcc
 
 ifndef prefix
   prefix=/usr/local
@@ -21,16 +21,16 @@
 endif
 
 ifndef OPTIMIZE
-  OPTIMIZE=-O3
+  OPTIMIZE=
 endif
 
-CFLAGS=-Wall $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(datadir)/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\"
+CFLAGS+=-Wall $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(datadir)/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\"
 
 SRC=icebreaker.c cursor.c grid.c laundry.c line.c penguin.c sound.c \
     level.c intro.c text.c status.c transition.c hiscore.c dialog.c \
     options.c fullscreen.c
 
-SDL_MIXER=-lSDL_mixer
+SDL_MIXER=-lSDL_mixer -lsmpeg
 SDL_LIB=$(SDL_LDFLAGS) $(SDL_MIXER) 
 SDL_CFLAGS := $(shell $(SDLCONFIG) --cflags)
 SDL_LDFLAGS := $(shell $(SDLCONFIG) --libs)
@@ -103,17 +103,17 @@
 	   sed 's/\$$VERDATE/$(VERDATE)/' > $@
 
 install: all
-	mkdir -p $(prefix)/bin
-	mkdir -p $(prefix)/share/icebreaker
-	mkdir -p $(highscoredir)
-	mkdir -p $(mandir)/man6
-
-	install -m 644 *.wav *.bmp $(prefix)/share/icebreaker
-	install -g games -s -m 2755 icebreaker $(prefix)/bin
-	install -m 644 icebreaker.6 $(mandir)/man6
+	$(MKDIR) $(prefix)/share/icebreaker
+	$(MKDIR) $(highscoredir)
+
+	$(BSD_INSTALL_DATA) *.wav *.bmp $(prefix)/share/icebreaker
+	$(BSD_INSTALL_PROGRAM) icebreaker $(prefix)/bin
+	$(BSD_INSTALL_MAN) icebreaker.6 $(mandir)/man6
 	touch $(highscoredir)/icebreaker.scores
-	chown games:games $(highscoredir)/icebreaker.scores
-	chmod 664 $(highscoredir)/icebreaker.scores
+	$(CHOWN) root:games $(prefix)/bin/icebreaker
+	$(CHMOD) 2755 $(prefix)/bin/icebreaker
+	$(CHOWN) root:games $(highscoredir)/icebreaker.scores
+	$(CHMOD) 664 $(highscoredir)/icebreaker.scores
 
 
 include $(SRC:.c=.d)
