Index: share/Makefile.am
===================================================================
--- share/Makefile.am	(revision 272)
+++ share/Makefile.am	(working copy)
@@ -1,8 +1,5 @@
-xmlfilesdir = $(DESTDIR)$(prefix)/share
-xmlfiles_DATA = \
+xmlfilesdir = $(pkgdatadir)
+dist_xmlfiles_DATA = \
 	endmills.xml \
 	machines.xml \
 	settings.xml
-
-EXTRA_DIST = \
-	$(xmlfiles_DATA)
Index: configure.ac
===================================================================
--- configure.ac	(revision 272)
+++ configure.ac	(working copy)
@@ -2,7 +2,6 @@
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([gcam.c])
 AC_PREFIX_DEFAULT([/usr/local/gcam])
-AM_CONFIG_HEADER(gcam_config.h)
 AM_INIT_AUTOMAKE(gcam, 2008.03.08)
 
 AC_PROG_CC
@@ -63,8 +62,6 @@
 AC_SUBST(GTKGLEXT_CFLAGS)
 AC_SUBST(GTKGLEXT_LIBS)
 
-AC_DEFINE_UNQUOTED(SHARE_PREFIX,"$prefix/share/",Define to share prefix)
-
 AC_CONFIG_FILES([Makefile \
 		libgcode/Makefile \
 		libgui/Makefile \
Index: samples/Makefile.am
===================================================================
--- samples/Makefile.am	(revision 272)
+++ samples/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
-gcamfilesdir = $(DESTDIR)$(prefix)/samples
-gcamfiles_DATA = \
+gcamfilesdir = $(pkgdatadir)/samples
+dist_gcamfiles_DATA = \
 	board_layout.gbr \
 	board_drill.cnc \
 	continuity.gcam \
@@ -7,6 +7,3 @@
 	motor_mount.gcam \
 	pattern.gcam \
 	test.gcam
-
-EXTRA_DIST = \
-	$(gcamfiles_DATA)
Index: libgui/gui_settings.c
===================================================================
--- libgui/gui_settings.c	(revision 272)
+++ libgui/gui_settings.c	(working copy)
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <expat.h>
-#include "gcam_config.h"
 
 
 void
Index: libgui/gui_endmills.c
===================================================================
--- libgui/gui_endmills.c	(revision 272)
+++ libgui/gui_endmills.c	(working copy)
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <expat.h>
-#include "gcam_config.h"
 
 
 void
Index: libgui/gui.c
===================================================================
--- libgui/gui.c	(revision 272)
+++ libgui/gui.c	(working copy)
@@ -8,7 +8,6 @@
 #include "gui_define.h"
 #include "gui_machines.h"
 #include "gui_endmills.h"
-#include "gcam_config.h"
 #include "gcode.h"
 #include <inttypes.h>
 #include <math.h>
Index: libgui/Makefile.am
===================================================================
--- libgui/Makefile.am	(revision 272)
+++ libgui/Makefile.am	(working copy)
@@ -11,6 +11,8 @@
 	@GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ \
 	-I${top_srcdir}/libgcode
 
+AM_CPPFLAGS = -DSHARE_PREFIX=\"$(pkgdatadir)/\"
+
 include_HEADERS = \
 	gui.h \
 	gui_define.h \
Index: libgui/gui_machines.c
===================================================================
--- libgui/gui_machines.c	(revision 272)
+++ libgui/gui_machines.c	(working copy)
@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <expat.h>
-#include "gcam_config.h"
 
 
 void