--- configure.in.old	2006-03-05 05:35:28.000000000 +0100
+++ configure.in	2006-03-05 05:35:40.000000000 +0100
@@ -72,11 +72,11 @@
 if test "x${prefix}" = "xNONE"; then
   packageprefix=${ac_default_prefix}
 else
-  packageprefix=${prefix}
+  packageprefix=${datadir}
 fi
 
 dnl Set PACKAGE DATA & DOC DIR
-packagedatadir=share/${PACKAGE}
+packagedatadir=${PACKAGE}
 packagedocdir=doc/${PACKAGE}
 
 dnl Set PACKAGE DIRS in config.h.
--- data/gfx/Makefile.am.old	2006-03-05 05:37:14.000000000 +0100
+++ data/gfx/Makefile.am	2006-03-05 05:38:28.000000000 +0100
@@ -3,7 +3,7 @@
 #  makefile for generating our gfx resource files
 #
 
-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/gfx
+gemhun_datadir = $(pkgdatadir)/gfx
 
 gemhun_data_DATA = \
 	default_gems.pax\
--- data/sfx/Makefile.am.old	2006-03-05 05:37:19.000000000 +0100
+++ data/sfx/Makefile.am	2006-03-05 05:38:28.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/sfx
+gemhun_datadir = $(pkgdatadir)/sfx
 
 gemhun_data_DATA = \
 	bang.wav\
--- data/music/Makefile.am.old	2006-03-05 05:37:23.000000000 +0100
+++ data/music/Makefile.am	2006-03-05 05:38:28.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/music
+gemhun_datadir = $(pkgdatadir)/music
 
 gemhun_data_DATA = \
 	pink.ogg
--- data/pax/networkscreen/Makefile.am.old	2006-03-05 05:37:36.000000000 +0100
+++ data/pax/networkscreen/Makefile.am	2006-03-05 05:38:28.000000000 +0100
@@ -3,7 +3,7 @@
 #  makefile for generating our gfx resource file
 #
 
-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/pax/networkscreen
+gemhun_datadir = $(pkgdatadir)/pax/networkscreen
 
 gemhun_data_DATA = \
 	Sonnenseite.xm\
--- data/pax/title/Makefile.am.old	2006-03-05 05:37:43.000000000 +0100
+++ data/pax/title/Makefile.am	2006-03-05 05:38:28.000000000 +0100
@@ -3,7 +3,7 @@
 #  makefile for generating our gfx resource file
 #
 
-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/pax/title
+gemhun_datadir = $(pkgdatadir)/pax/title
 
 gemhun_data_DATA = \
 	fdream.xm\
--- data/levels/Makefile.am.old	2006-03-05 05:37:50.000000000 +0100
+++ data/levels/Makefile.am	2006-03-05 05:38:28.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-gemhun_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/pax/levels
+gemhun_datadir = $(pkgdatadir)/levels
 
 gemhun_data_DATA = \
 	level0.dat\
--- pixmaps/Makefile.am.old	2006-03-05 05:43:12.000000000 +0100
+++ pixmaps/Makefile.am	2006-03-05 05:43:30.000000000 +0100
@@ -4,7 +4,7 @@
 ## If you don't want it to overwrite it,
 ## 	Please disable it in the Anjuta project configuration
 
-gemhun_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@
+gemhun_pixmapsdir = $(pkgdatadir)/pixmaps
 
 gemhun_pixmaps_DATA = \
 	gemhun.png
--- include/Makefile.am.old	2006-03-05 05:44:50.000000000 +0100
+++ include/Makefile.am	2006-03-05 05:45:04.000000000 +0100
@@ -4,9 +4,8 @@
 ## If you don't want it to overwrite it,
 ## 	Please disable it in the Anjuta project configuration
 
-gemhun_includedir = $(pkgincludedir)
 
-gemhun_include_DATA = \
+noinst_HEADERS = \
 	SDL_rotozoom.h\
 	ai.h\
 	audio.h\
@@ -39,4 +38,3 @@
 	video_overlay.h\
 	nconsole.h
 
-EXTRA_DIST = $(gemhun_include_DATA)
--- Makefile.am.old	2006-03-05 05:45:40.000000000 +0100
+++ Makefile.am	2006-03-05 05:45:59.000000000 +0100
@@ -5,18 +5,10 @@
 
 SUBDIRS = intl po data include src pixmaps
 
-gemhundocdir = ${prefix}/doc/GemHunters
-gemhundoc_DATA = \
-	README\
-	COPYING\
-	AUTHORS\
-	ChangeLog\
-	INSTALL\
-	NEWS\
+EXTRA_DIST = \
 	TODO\
 	ABOUT-NLS
 
-EXTRA_DIST = $(gemhundoc_DATA)
 
 
 
--- src/Makefile.am.old	2006-03-05 05:46:53.000000000 +0100
+++ src/Makefile.am	2006-03-05 05:46:57.000000000 +0100
@@ -16,11 +16,11 @@
 INCLUDES =\
 	 -I../include
 
-CFLAGS =\
+AM_CFLAGS =\
 	$(SDL_CFLAGS) $(KYRA_CFLAGS) $(NCURSES_CFLAGS)\
 	 -Wall -g
 
-CXXFLAGS =\
+AM_CXXFLAGS =\
 	$(SDL_CFLAGS) $(KYRA_CFLAGS) $(NCURSES_CFLAGS)\
 	 -Wall -g
 
--- src/main.cpp.old	2006-03-05 05:47:47.000000000 +0100
+++ src/main.cpp	2006-03-05 05:47:52.000000000 +0100
@@ -459,7 +459,6 @@
 #ifdef __NETWORK_SUPPORT__
 	if ( dedicated_server && ! no_curs_gui )
 		network . EnableConsolePrinting ( NULL, NULL ) ;
-	network . ListenOnPort ( server_port ) ;
 	network . UpdateNConsole () ;
 	if ( strcmp ( pkg_filename, "network" ) != 0 ||
 		( dedicated_server && no_curs_gui ) )