Username: Password: Remember me
diff -rupN src/Makefile.in patch/Makefile.in
--- src/Makefile.in	2013-12-27 19:39:50.000000000 +0100
+++ patch/Makefile.in	2013-12-27 19:35:09.000000000 +0100
@@ -213,8 +213,8 @@ ${JMADIR}/zsnesjma.o: ${JMADIR}/zsnesjma
 install:
 	@INSTALL@ -d -m 0755 ${DESTDIR}/@prefix@/bin
 	@INSTALL@ -m 0755 @ZSNESEXE@ ${DESTDIR}/@prefix@/bin
-	@INSTALL@ -d -m 0755 ${DESTDIR}/@prefix@/man/man1
-	@INSTALL@ -m 0644 linux/zsnes.1 ${DESTDIR}/@prefix@/man/man1
+	@INSTALL@ -d -m 0755 ${DESTDIR}/@prefix@/share/man/man1
+	@INSTALL@ -m 0644 linux/zsnes.1 ${DESTDIR}/@prefix@/share/man/man1
 
 uninstall:
 	rm -f @prefix@/bin/$(notdir @ZSNESEXE@) @prefix@/man/man5/zsnes.5
diff -rupN src/autogen.sh patch/autogen.sh
--- src/autogen.sh	2013-12-27 20:12:37.000000000 +0100
+++ patch/autogen.sh	2013-12-27 20:24:08.000000000 +0100
@@ -3,8 +3,7 @@
 echo "Generating build information using aclocal and autoconf..."
 
 # Regenerate configuration files
-aclocal	--acdir=`sdl-config --prefix`/share/aclocal	# thanks asfand
-autoconf
+autoreconf -fi
 
 # Run configure for this platform
 ./configure $*
diff -rupN src/configure.in patch/configure.in
--- src/configure.in	2013-12-27 19:39:39.000000000 +0100
+++ patch/configure.in	2013-12-27 19:38:48.000000000 +0100
@@ -114,13 +114,13 @@ if test x$debug = xyes; then
 
 	CFLAGS="$CFLAGS -DDEBUG -O0 -fno-omit-frame-pointer -ggdb3"
 	NFLAGS="$NFLAGS -DDEBUG -g -s -O1" dnl -O0 doesnt work
-	ZSNESEXE="zsnesd"
+	ZSNESEXE="zsnesd-1.42"
 else
 	AC_MSG_RESULT(no)
 
 	CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s"
 	NFLAGS="$NFLAGS -O1"
-	ZSNESEXE="zsnes"
+	ZSNESEXE="zsnes-1.42"
 fi
 
 AC_MSG_CHECKING(which processor class to optimize for)
diff -rupN src/linux/zfilew.c patch/linux/zfilew.c
--- src/linux/zfilew.c	2013-12-27 19:39:55.000000000 +0100
+++ patch/linux/zfilew.c	2013-12-27 19:49:16.000000000 +0100
@@ -464,7 +464,7 @@ extern char LoadDir[512];
 #ifdef __LINUX__
 
 char zcfgdir[1024];
-#define ZCFG_DIR "/.zsnes"
+#define ZCFG_DIR "/.zsnes-1-42"
 #define ZCFG_DIR_LEN (1023-strlen(ZCFG_DIR))
 
 void obtaindir()
@@ -476,9 +476,13 @@ void obtaindir()
   {
     homedir = (char *)malloc(ZCFG_DIR_LEN);
     getcwd(homedir, ZCFG_DIR_LEN);
+    strcpy(zcfgdir, homedir);
+    free(homedir);
+  }
+  else
+  {
+    strcpy(zcfgdir, homedir);
   }
-  strcpy(zcfgdir, homedir);
-  free(homedir);
   strcat(zcfgdir, ZCFG_DIR);
   tmp = opendir(zcfgdir);
   if (tmp == NULL) 
diff -rupN src/zip/zpng.c patch/zip/zpng.c
--- src/zip/zpng.c	2013-12-27 19:40:03.000000000 +0100
+++ patch/zip/zpng.c	2013-12-27 19:36:42.000000000 +0100
@@ -83,8 +83,6 @@ int Png_Dump(const char * filename, unsi
 		8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
 		PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
-	info_ptr->color_type=PNG_COLOR_TYPE_RGB_ALPHA;
-
 	/*Allocate an array of scanline pointers*/
 	row_pointers=(png_bytep*)malloc(height*sizeof(png_bytep));
 	for (i=0;i<height;i++)