+--- endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile.orig 2014-02-02 19:55:48.408091441 +0100
++++ endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile 2014-02-02 20:09:25.538057149 +0100
+@@ -6,8 +6,8 @@
+ MAN1_DIR = $(PREFIX)/man/man1
+ MAN3_DIR = $(PREFIX)/man/man3
+ EDV_ARCH_DIR = $(PREFIX)/lib/endeavour2
+-EDV_INCLUDE_DIR = $(PREFIX)/lib/endeavour2/include
+-EDV_LIB_DIR = $(PREFIX)/lib/endeavour2/lib
++EDV_INCLUDE_DIR = $(PREFIX)/include/endeavour2
++EDV_LIB_DIR = $(LIB_DIR)
+ LIB = libendeavour2-base.so
+ LIB_CFG_BIN = endeavour2-base-config
+ LIB_CFG_MAN = endeavour2-base-config.1.bz2
+--- endeavour-3.1.4/endeavour2/platforms.ini.orig 2009-09-12 09:00:00.000000000 +0200
++++ endeavour-3.1.4/endeavour2/platforms.ini 2014-02-04 16:46:12.354650452 +0100
+@@ -410,20 +410,14 @@
+ Platform = Linux
+ Description = For most any Linux system
+ PREFIX = /usr
+- CFLAGS = -Wall -O2 -DNEED_STRCASESTR
++ CFLAGS = $(OPTCFLAGS) -Wall
+ LIBS = -lendeavour2-base -lm
+ LIB_DIR = -L./libendeavour2-base
+ CC = cc
+ CPP = c++
+ PlatformSearchPathInclude = /usr/include
+- PlatformSearchPathInclude = /usr/X11R6/include
+- PlatformSearchPathInclude = /usr/local/include
+- PlatformSearchPathInclude = /opt/gnome/include
+ PlatformSearchPathLib = /lib
+ PlatformSearchPathLib = /usr/lib
+- PlatformSearchPathLib = /usr/X11R6/lib
+- PlatformSearchPathLib = /usr/local/lib
+- PlatformSearchPathLib = /opt/gnome/lib
+ PlatformSearchPathEtc = /etc
+ PlatformSearchPathEtc = /usr/etc
+ PlatformSearchPathEtc = /usr/local/etc
+@@ -432,45 +426,12 @@
+ PlatformSearchPathBin = /usr/X11R6/bin
+ PlatformSearchPathBin = /usr/local/bin
+ PlatformSearchPathBin = /usr/games
+- PlatformSearchPathBin = /opt/gnome/bin
+ PlatformSearchPathData = /usr/share/icons
+ PlatformSearchPathData = /usr/share/games
+ PlatformFeature = debug
+ Description = Just adds -g to the CFLAGS for debugging
+ MustExist = No
+ FeatureCFLAGS = -g
+- PlatformFeature = arch-i486
+- Description = Adds -march=i486 for 486 specific optimizations
+- MustExist = Preferred
+- FeatureCFLAGS = -march=i486
+- FeatureDepend = i486
+- DependType = Machine
+- MustExist = Yes
+- DependMachine = i486
+- PlatformFeature = arch-i586
+- Description = Adds -march=i586 for Pentium specific optimizations
+- MustExist = Preferred
+- FeatureCFLAGS = -march=i586
+- FeatureDepend = i586
+- DependType = Machine
+- MustExist = Yes
+- DependMachine = i586
+- PlatformFeature = arch-i686
+- Description = Adds -march=i686 for Pentium Pro specific optimizations
+- MustExist = Preferred
+- FeatureCFLAGS = -march=i686
+- FeatureDepend = i686
+- DependType = Machine
+- MustExist = Yes
+- DependMachine = i686
+- PlatformFeature = arch-pentiumpro
+- Description = Adds -march=pentiumpro for Pentium Pro specific optimizations
+- MustExist = Preferred
+- FeatureCFLAGS = -march=pentiumpro
+- FeatureDepend = pentiumpro
+- DependType = Machine
+- MustExist = Yes
+- DependMachine = pentiumpro
+ PlatformFeature = libz
+ Description = GNU Z Compression/Decompression Library
+ MustExist = Preffered
+@@ -591,7 +552,6 @@
+ MustExist = Preffered
+ FeatureCFLAGS = -DHAVE_LIBXPM
+ FeatureLIBS = -lXpm
+- FeatureLIB_DIR = -L/usr/X11R6/lib/
+ FeatureDepend = libxpm-devel
+ DependType = Header
+ MustExist = Yes
+@@ -611,11 +571,10 @@
+ MustExist = Preferred
+ FeatureCFLAGS = -DHAVE_XF86_VIDMODE
+ FeatureLIBS = -lXxf86vm
+- FeatureLIB_DIR = -L/usr/X11R6/lib/
+ FeatureDepend = xf86vidmode-lib
+ DependType = Library
+ MustExist = Yes
+- DependPath = libXxf86vm.a
++ DependPath = libXxf86vm.so
+ DependGrepString = XF86VidModeQueryExtension
+ FeatureDepend = xf86vidmode-devel
+ DependType = Header
+@@ -627,13 +586,11 @@
+ MustExist = Yes
+ FeatureCFLAGS = `gtk-config --cflags`
+ FeatureLIBS = `gtk-config --libs`
+- FeatureLIB_DIR = -L/usr/X11R6/lib
+ FeatureDepend = gtk-devel
+ DependType = Program