--- aisleriot/Makefile.in.orig	Mon Feb 15 13:57:56 1999
+++ aisleriot/Makefile.in	Fri Feb 19 13:24:41 1999
@@ -130,7 +130,7 @@
 
 SUBDIRS = docs pixmaps
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = sol
--- aisleriot/docs/Makefile.in.orig	Mon Feb 15 13:58:07 1999
+++ aisleriot/docs/Makefile.in	Fri Feb 19 13:24:41 1999
@@ -128,7 +128,7 @@
 XPM_LIBS = @XPM_LIBS@
 l = @l@
 
-helpdir = $(datadir)/gnome/help/aisleriot/C
+helpdir = $(datadir)/help/aisleriot/C
 
 help_DATA = index.html intro.html glossary.html gpl.html 	camelot.html canfield.html clock.html doublets.html 	eagle-wing.html fortunes.html klondike.html pileon.html 	neighbor.html odessa.html osmosis.html spider.html yukon.html 	beleaguered-castle.html 	camelot-goal.gif clock-rules.gif docbook.css topic.dat
 
--- freecell/src/Makefile.in.orig	Mon Feb 15 13:57:16 1999
+++ freecell/src/Makefile.in	Fri Feb 19 13:24:41 1999
@@ -124,7 +124,7 @@
 
 Gamesdir = $(datadir)/apps/Games
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					-I$(srcdir)/../gdk-card-image
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					-I$(srcdir)/../gdk-card-image
 
 
 bin_PROGRAMS = freecell
--- gnibbles/Makefile.in.orig	Sun Feb 21 03:28:13 1999
+++ gnibbles/Makefile.in	Sun Feb 21 03:28:33 1999
@@ -128,7 +128,7 @@
 soundlistdir = $(sysconfdir)/sound/events
 Gamesdir = $(datadir)/apps/Games
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnibbles
--- gnobots/Makefile.in.orig	Mon Feb 15 13:57:38 1999
+++ gnobots/Makefile.in	Fri Feb 19 13:24:41 1999
@@ -129,7 +129,7 @@
 
 SUBDIRS = help
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnobots
--- gnobots/help/C/Makefile.in.orig	Mon Feb 15 13:57:40 1999
+++ gnobots/help/C/Makefile.in	Fri Feb 19 13:24:41 1999
@@ -125,7 +125,7 @@
 EXTRA_DIST = index.html 	     topic.dat
 
 
-gnobots_helpdir = $(datadir)/gnome/help/gnobots/C
+gnobots_helpdir = $(datadir)/help/gnobots/C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../config.h
 CONFIG_CLEAN_FILES = 
--- gnobots/help/es/Makefile.in.orig	Mon Feb 15 13:57:41 1999
+++ gnobots/help/es/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -125,7 +125,7 @@
 EXTRA_DIST = index.html 	     topic.dat
 
 
-gnobots_helpdir = $(datadir)/gnome/help/gnobots/es
+gnobots_helpdir = $(datadir)/help/gnobots/es
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../config.h
 CONFIG_CLEAN_FILES = 
--- gnobots2/Makefile.in.orig	Mon Feb 15 13:57:43 1999
+++ gnobots2/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -132,7 +132,7 @@
 
 SUBDIRS = help
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnobots2
--- gnobots2/help/C/Makefile.in.orig	Mon Feb 15 13:57:45 1999
+++ gnobots2/help/C/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -125,7 +125,7 @@
 EXTRA_DIST = index.html 	     topic.dat
 
 
-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/C
+gnobots2_helpdir = $(datadir)/help/gnobots2/C
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../config.h
 CONFIG_CLEAN_FILES = 
--- gnobots2/help/es/Makefile.in.orig	Mon Feb 15 13:57:46 1999
+++ gnobots2/help/es/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -125,7 +125,7 @@
 EXTRA_DIST = index.html 	     topic.dat
 
 
-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/es
+gnobots2_helpdir = $(datadir)/help/gnobots2/es
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../config.h
 CONFIG_CLEAN_FILES = 
--- gnome-stones/Makefile.in.orig	Mon Feb 15 13:57:53 1999
+++ gnome-stones/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -129,7 +129,7 @@
 Pixmapdir = $(datadir)/pixmaps
 Cavesdir = $(datadir)/gnome-stones
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-DCAVESDIR=\""$(Cavesdir)"\"				-I$(includedir)						$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-DCAVESDIR=\""$(Cavesdir)"\"				-I$(includedir)						$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnome-stones
--- gnome-stones/objects/Makefile.in.orig	Mon Feb 15 13:57:54 1999
+++ gnome-stones/objects/Makefile.in	Sun Feb 21 04:22:07 1999
@@ -124,9 +124,9 @@
 
 GSTONES_SRC_DIR = $(srcdir)/../
 
-objectdir = $(libdir)/gnome-stones/objects
+objectdir = $(datadir)/gnome-stones/objects
 
-INCLUDES =  	-I$(GSTONES_SRC_DIR)					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-I$(includedir)						$(GNOME_INCLUDEDIR)
+INCLUDES =  	-I$(GSTONES_SRC_DIR)					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-I$(includedir)						$(GNOME_INCLUDEDIR)
 
 
 object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
@@ -141,10 +141,10 @@
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 LIBS = @LIBS@
-libgnome_stones_la_LDFLAGS = 
+libgnome_stones_la_LDFLAGS = --export-dynamic
 libgnome_stones_la_LIBADD = 
 libgnome_stones_la_OBJECTS =  gnome-stones.lo
-libgnomekoban_la_LDFLAGS = 
+libgnomekoban_la_LDFLAGS = --export-dynamic
 libgnomekoban_la_LIBADD = 
 libgnomekoban_la_OBJECTS =  gnomekoban.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- gnometris/Makefile.in.orig	Mon Feb 15 13:58:10 1999
+++ gnometris/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -126,7 +126,7 @@
 scoredir = $(localstatedir)/games
 Gamesdir = $(datadir)/apps/Games
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnometris
--- gnomine/Makefile.in.orig	Mon Feb 15 13:57:17 1999
+++ gnomine/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -125,7 +125,7 @@
 scoredir = $(localstatedir)/games
 Gamesdir = $(datadir)/apps/Games
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnomine
--- gnothello/Makefile.in.orig	Mon Feb 15 13:57:49 1999
+++ gnothello/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -127,7 +127,7 @@
 Gamesdir = $(datadir)/apps/Games
 appicondir = $(datadir)/pixmaps
 
-INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
+INCLUDES =  	-DHAVE_ORBIT 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR) -I.
 
 
 bin_PROGRAMS = iagno
--- gnotravex/Makefile.in.orig	Mon Feb 15 13:57:51 1999
+++ gnotravex/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -126,7 +126,7 @@
 pixmapdir = $(datadir)/pixmaps/gnotravex
 Gamesdir = $(datadir)/apps/Games
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir) $(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = gnotravex
--- gturing/Makefile.in.orig	Mon Feb 15 13:57:32 1999
+++ gturing/Makefile.in	Sun Feb 21 04:24:15 1999
@@ -122,12 +122,10 @@
 XPM_LIBS = @XPM_LIBS@
 l = @l@
 
-SUBDIRS = help
-
 Gamesdir = $(datadir)/apps/Games
 examplesdir = $(datadir)/gturing/examples
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)			 	-DVERSION=\""$(VERSION)"\" 	-DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\"
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				 	$(GNOME_INCLUDEDIR)			 	-DVERSION=\""$(VERSION)"\" 	-DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\"
 
 
 bin_PROGRAMS = gturing
--- gyahtzee/Makefile.in.orig	Mon Feb 15 13:57:35 1999
+++ gyahtzee/Makefile.in	Sun Feb 21 04:25:11 1999
@@ -127,12 +127,12 @@
 
 SUBDIRS = pix
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\"		-I$(includedir)						$(GNOME_INCLUDEDIR)					$(CURSES_INCLUDEDIR)
 
 
 @HAS_CURSES_TRUE@CTALI = ctali
 
-bin_PROGRAMS = gtali	$(CTALI)
+bin_PROGRAMS = gtali
 
 gtali_SOURCES =          gyahtzee.c               gyahtzee.h               clist.c                  yahtzee.h                yahtzee.c                computer.c               setup.c
 
--- mahjongg/Makefile.in.orig	Mon Feb 15 13:57:31 1999
+++ mahjongg/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -127,7 +127,7 @@
 Gamesdir = $(datadir)/apps/Games
 appicondir = $(datadir)/pixmaps
 
-INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
+INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = mahjongg
--- metatris/Makefile.in.orig	Mon Feb 15 13:58:13 1999
+++ metatris/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -145,7 +145,7 @@
 metatris_LDFLAGS = $(GTK_LIBS)		$(GNOME_LIBDIR) 		$(GNOMEUI_LIBS)			$(INTLLIBS)
 
 
-CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
+CPPFLAGS =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DBINDIR=\""$(bindir)"\"		-DDATADIR=\""$(datadir)"\"		-DMYDATADIR=\""$(mydatadir)"\"
 
 
 scoredir = $(localstatedir)/games
--- same-gnome/Makefile.in.orig	Mon Feb 15 13:57:18 1999
+++ same-gnome/Makefile.in	Fri Feb 19 13:24:42 1999
@@ -128,7 +128,7 @@
 
 SUBDIRS = help
 
-INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
+INCLUDES = -I.. -I$(srcdir)/..			-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)				$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = same-gnome
--- same-gnome/help/C/Makefile.in.orig	Sun Feb 21 04:26:30 1999
+++ same-gnome/help/C/Makefile.in	Sun Feb 21 04:26:40 1999
@@ -122,7 +122,7 @@
 XPM_LIBS = @XPM_LIBS@
 l = @l@
 
-same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C
+same_gnome_helpdir = $(datadir)/help/samegnome/C
 
 same_gnome_help_DATA =  	index.html			topic.dat
 
--- scottfree/Makefile.in.orig	Sun Feb 21 04:27:05 1999
+++ scottfree/Makefile.in	Sun Feb 21 04:27:17 1999
@@ -122,7 +122,7 @@
 XPM_LIBS = @XPM_LIBS@
 l = @l@
 
-INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	-I$(includedir)			$(GNOME_INCLUDEDIR)
+INCLUDES =  	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-I$(includedir)			$(GNOME_INCLUDEDIR)
 
 
 bin_PROGRAMS = GnomeScott
--- po/Makefile.in.in.orig	Sun Feb 21 04:27:30 1999
+++ po/Makefile.in.in	Sun Feb 21 04:27:40 1999
@@ -18,7 +18,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
 localedir = $(datadir)/locale
 gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po