--- ./makefile.orig	2011-08-12 20:37:59.000000000 +0200
+++ ./makefile	2011-10-04 20:14:30.000000000 +0200
@@ -51,7 +51,7 @@
 #    ask for a package with convenience libraries instead -- we'll try to provide
 #    them somewhere in the near future.
 
-GAME = crawl
+GAME = stonesoup
 
 ASSERTS = yes
 
@@ -92,11 +92,11 @@
 
 else
 
-CFOPTIMIZE := -O2
+CFOPTIMIZE :=
 
 endif # USE_ICC
 
-CFOTHERS := -pipe $(EXTERNAL_FLAGS)
+CFOTHERS := $(CFLAGS)
 CFWARN := -Wall
 CFWARN_L := -Wundef
 
@@ -664,7 +664,7 @@
 DEFINES += -DWIZARD
 endif
 ifdef NO_OPTIMIZE
-CFOPTIMIZE  := -O0
+CFOPTIMIZE  :=
 endif
 ifdef PCH
 CFWARN_L += -Winvalid-pch
@@ -901,7 +901,7 @@
 
 GAME_DEPENDS  := $(DESTTILEFILES) $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS)
 SRC_PKG_BASE  := stone_soup
-SRC_VERSION   := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
+SRC_VERSION   := $(cat util/release_ver)
 
 export SRC_VERSION
 
