--- snes9x-1.54.1/gtk/configure.ac
+++ snes9x-1.54.1/gtk/configure.ac
@@ -33,7 +33,7 @@
 
 AM_GLIB_GNU_GETTEXT
 
-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
+snes9xlocaledir='/usr/share/locale'
 AC_SUBST(snes9xlocaledir)
 
 AC_ARG_WITH(debug,
--- snes9x-1.54.1/unix/configure.ac
+++ snes9x-1.54.1/unix/configure.ac
@@ -56,20 +56,6 @@
 # *** Execution begins here ***
 # *****************************
 
-# Remove -g and -O2 flags manually.
-
-if test "x$CFLAGS" != "x"; then
-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
-	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
-fi
-
-if test "x$CXXFLAGS" != "x"; then
-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
-	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
-fi
-
-# Test what compiler flags we should use.
-
 AC_ARG_ENABLE([debug],
 	[AS_HELP_STRING([--enable-debug],
 		[leave debug information in the final binary (default: no)])],
@@ -79,9 +65,6 @@
 	AC_S9X_COMPILER_FLAG([-g],  [g])
 	AC_S9X_COMPILER_FLAG([-O0], [o0])
 else
-	AC_S9X_COMPILER_FLAG([-O3], [o3], [
-		AC_S9X_COMPILER_FLAG([-O2], [o2], [
-			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
 	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
 fi
 
--- snes9x-1.54.1/unix/Makefile.in
+++ snes9x-1.54.1/unix/Makefile.in
@@ -47,7 +47,7 @@
 	exit 1
 
 snes9x: $(OBJECTS)
-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
+	$(CCC) $(LDFLAGS) $(INCLUDES) -o $@ $(OBJECTS) -lm @S9XLIBS@
 
 ../jma/s9x-jma.o: ../jma/s9x-jma.cpp
 	$(CCC) $(INCLUDES) -c $(CCFLAGS) -fexceptions $*.cpp -o $@