$OpenBSD: patch-Makefile,v 1.3 2008/01/26 16:32:14 merdely Exp $
--- Makefile.orig	Sat Sep 15 05:31:37 2007
+++ Makefile	Wed Jan 23 20:43:53 2008
@@ -319,7 +319,7 @@ CC_VERSION = $(shell $(CC_TARGET) -dumpversion | cut -
 # GNU make can only test for (in)equality
 # this is a workaround to test for >=
 ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
-  CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wundef
+  CFLAGS += -Wall -Wno-multichar -Wsign-compare -Wundef
   CC_CFLAGS += -Wstrict-prototypes
   CFLAGS += -Wwrite-strings -Wpointer-arith
 endif
@@ -408,7 +408,6 @@ LRT:=
 endif
 endif
 
-CFLAGS += $(BASECFLAGS)
 
 ifdef UNIX
 CDEFS += -DUNIX
@@ -933,7 +932,7 @@ endif
 
 $(STRGEN): strgen/strgen.c string.c endian_host.h table/control_codes.h
 	@echo '===> Compiling and Linking $@'
-	$(Q)$(CC_HOST) $(CFLAGS_HOST) -DSTRGEN strgen/strgen.c string.c -o $@
+	$(Q)$(CC_HOST) $(CFLAGS) -DSTRGEN strgen/strgen.c string.c -o $@
 
 table/strings.h: lang/english.txt $(STRGEN)
 	@echo '===> Generating $@'
@@ -957,8 +956,6 @@ release: all
 	$(Q)cp -R $(TTD)                      "/t/openttd-$(REV)-morphos/"
 	$(Q)cp data/*                         "/t/openttd-$(REV)-morphos/data/"
 	$(Q)cp lang/*.lng                     "/t/openttd-$(REV)-morphos/lang/"
-	$(Q)-cp scenario/*.scn                "/t/openttd-$(REV)-morphos/scenario/"
-	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(REV)-morphos/scenario/heightmap/"
 	$(Q)cp readme.txt                     "/t/openttd-$(REV)-morphos/docs/ReadMe"
 	$(Q)cp COPYING                        "/t/openttd-$(REV)-morphos/docs/"
 	$(Q)cp changelog.txt                  "/t/openttd-$(REV)-morphos/docs/ChangeLog"
