--- aisleriot/Makefile.in.orig Sun Sep 26 13:29:13 1999
+++ aisleriot/Makefile.in Mon Sep 27 09:30:04 1999
@@ -128,12 +128,12 @@
scoredir = $(localstatedir)/games
cardimagedir = $(datadir)/pixmaps/cards
icondir = $(datadir)/pixmaps
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
typesdir = $(datadir)/sol-games
-SUBDIRS = docs pixmaps
+SUBDIRS = pixmaps
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS)
bin_PROGRAMS = sol
@@ -154,7 +154,7 @@
EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h
-sysdir = $(datadir)/gnome/apps/Games
+sysdir = $(datadir)/apps/Games
sys_DATA = sol.desktop
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
--- aisleriot/docs/Makefile.in.orig Sun Sep 26 13:29:29 1999
+++ aisleriot/docs/Makefile.in Mon Sep 27 09:30:38 1999
@@ -131,7 +131,7 @@
ZVT_LIBS = @ZVT_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 elevator.html fortunes.html kansas.html klondike.html first-law.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html scorpion.html thumb-and-pouch.html neighbor.html odessa.html osmosis.html spider.html yukon.html westhaven.html royal-east.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html union-square.html camelot-goal.gif clock-rules.gif docbook.css topic.dat straight-up.html zebra.html lady-jane.html
--- freecell/src/Makefile.in.orig Sun Sep 26 13:28:36 1999
+++ freecell/src/Makefile.in Mon Sep 27 09:31:48 1999
@@ -125,9 +125,9 @@
ZVT_LIBS = @ZVT_LIBS@
l = @l@
-Gamesdir = $(datadir)/gnome/apps/Games
+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
--- gataxx/Makefile.in.orig Sun Sep 26 13:29:41 1999
+++ gataxx/Makefile.in Mon Sep 27 09:47:28 1999
@@ -127,10 +127,10 @@
scoredir = $(localstatedir)/games
pixmapdir = $(datadir)/pixmaps/gataxx
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
appicondir = $(datadir)/pixmaps
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I.
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I.
bin_PROGRAMS = gataxx
--- glines/Makefile.in.orig Sun Sep 26 13:29:40 1999
+++ glines/Makefile.in Mon Sep 27 09:48:33 1999
@@ -128,11 +128,11 @@
scoredir = $(localstatedir)/games
pixmapdir = $(datadir)/pixmaps/glines
icondir = $(datadir)/pixmaps
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
#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 = glines
--- gnibbles/Makefile.in.orig Sun Sep 26 13:29:38 1999
+++ gnibbles/Makefile.in Mon Sep 27 09:32:42 1999
@@ -129,10 +129,10 @@
configdir = $(datadir)/gnibbles
icondir = $(datadir)/pixmaps
soundlistdir = $(sysconfdir)/sound/events
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
scoredir = $(localstatedir)/games
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = gnibbles
--- gnobots2/Makefile.in.orig Sun Sep 26 13:29:01 1999
+++ gnobots2/Makefile.in Mon Sep 27 09:33:16 1999
@@ -131,11 +131,11 @@
soundlistdir = $(sysconfdir)/sound/events
sounddir = $(datadir)/sounds/gnobots2
appicondir = $(datadir)/pixmaps
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
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 Sun Sep 26 13:29:03 1999
+++ gnobots2/help/C/Makefile.in Mon Sep 27 09:34:12 1999
@@ -128,7 +128,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 Sun Sep 26 13:29:04 1999
+++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999
@@ -128,7 +128,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 =
--- gnobots2/help/it/Makefile.in.orig Sun Sep 26 13:29:05 1999
+++ gnobots2/help/it/Makefile.in Mon Sep 27 09:34:56 1999
@@ -128,7 +128,7 @@
EXTRA_DIST = index.html topic.dat
-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it
+gnobots2_helpdir = $(datadir)/help/gnobots2/it
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =
--- gnome-stones/Makefile.in.orig Sun Sep 26 13:29:10 1999
+++ gnome-stones/Makefile.in Mon Sep 27 09:36:59 1999
@@ -127,12 +127,12 @@
SUBDIRS = objects graphics
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
scoredir = $(localstatedir)/games
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
@@ -147,7 +147,7 @@
Games_DATA = gnome-stones.desktop
Caves_DATA = default.caves tutorial.caves gnomekoban.caves
-gtkrcdir = $(datadir)
+gtkrcdir = $(datadir)/gnome-stones
gtkrc_DATA = gnome-stonesrc gnome-stonesrc.ko
Mimedir = $(datadir)/mime-info
--- gnome-stones/objects/Makefile.in.orig Sun Sep 26 13:29:11 1999
+++ gnome-stones/objects/Makefile.in Mon Sep 27 09:36:59 1999
@@ -127,9 +127,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
@@ -144,10 +144,10 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
LIBS = @LIBS@
-libgnome_stones_la_LDFLAGS =
+libgnome_stones_la_LDFLAGS = -avoid-version
libgnome_stones_la_LIBADD =
libgnome_stones_la_OBJECTS = gnome-stones.lo
-libgnomekoban_la_LDFLAGS =
+libgnomekoban_la_LDFLAGS = -avoid-version
libgnomekoban_la_LIBADD =
libgnomekoban_la_OBJECTS = gnomekoban.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- gnometris/Makefile.in.orig Sun Sep 26 13:29:31 1999
+++ gnometris/Makefile.in Mon Sep 27 09:36:59 1999
@@ -127,9 +127,9 @@
SUBDIRS = pix
scoredir = $(localstatedir)/games
-Gamesdir = $(datadir)/gnome/apps/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 Sun Sep 26 13:28:37 1999
+++ gnomine/Makefile.in Mon Sep 27 09:36:59 1999
@@ -126,9 +126,9 @@
l = @l@
scoredir = $(localstatedir)/games
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = gnomine
--- gnotravex/Makefile.in.orig Sun Sep 26 13:29:09 1999
+++ gnotravex/Makefile.in Mon Sep 27 09:37:08 1999
@@ -127,9 +127,9 @@
scoredir = $(localstatedir)/games
pixmapdir = $(datadir)/pixmaps/gnotravex
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = gnotravex
--- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999
+++ gtali/Makefile.in Mon Sep 27 09:44:54 1999
@@ -125,12 +125,12 @@
ZVT_LIBS = @ZVT_LIBS@
l = @l@
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
scoredir = $(localstatedir)/games
SUBDIRS = pix help
-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
--- gtali/help/C/Makefile.in.orig Sun Sep 26 13:29:00 1999
+++ gtali/help/C/Makefile.in Mon Sep 27 09:45:28 1999
@@ -128,7 +128,7 @@
EXTRA_DIST = index.html topic.dat
-gtali_helpdir = $(datadir)/gnome/help/gtali/C
+gtali_helpdir = $(datadir)/help/gtali/C
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =
--- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999
+++ gturing/Makefile.in Mon Sep 27 09:37:08 1999
@@ -125,12 +125,12 @@
ZVT_LIBS = @ZVT_LIBS@
l = @l@
-SUBDIRS = help
+# SUBDIRS = help
-Gamesdir = $(datadir)/gnome/apps/Games
+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
--- gturing/help/C/Makefile.in.orig Sun Sep 26 13:28:56 1999
+++ gturing/help/C/Makefile.in Mon Sep 27 09:37:08 1999
@@ -125,7 +125,7 @@
ZVT_LIBS = @ZVT_LIBS@
l = @l@
-gturing_helpdir = $(datadir)/gnome/help/gturing/C
+gturing_helpdir = $(datadir)/help/gturing/C
gturing_help_DATA = index.html topic.dat
--- iagno/Makefile.in.orig Sun Sep 26 13:29:07 1999
+++ iagno/Makefile.in Mon Sep 27 09:49:30 1999
@@ -127,10 +127,10 @@
scoredir = $(localstatedir)/games
pixmapdir = $(datadir)/pixmaps/iagno
-Gamesdir = $(datadir)/gnome/apps/Games
+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
--- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999
+++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999
@@ -128,10 +128,10 @@
scoredir = $(localstatedir)/games
pixmapdir = $(datadir)/pixmaps/mahjongg
bgdir = $(datadir)/pixmaps/mahjongg/bg
-Gamesdir = $(datadir)/gnome/apps/Games
+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
--- same-gnome/Makefile.in.orig Sun Sep 26 13:28:38 1999
+++ same-gnome/Makefile.in Mon Sep 27 09:50:47 1999
@@ -127,11 +127,11 @@
scoredir = $(localstatedir)/games
pixmapdir = $(datadir)/pixmaps/same-gnome
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
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 Sep 26 13:28:50 1999
+++ same-gnome/help/C/Makefile.in Mon Sep 27 09:51:19 1999
@@ -125,7 +125,7 @@
ZVT_LIBS = @ZVT_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 Sep 26 13:28:52 1999
+++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999
@@ -125,7 +125,7 @@
ZVT_LIBS = @ZVT_LIBS@
l = @l@
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = GnomeScott
--- xbill/Makefile.in.orig Sun Sep 26 13:29:33 1999
+++ xbill/Makefile.in Mon Sep 27 09:53:11 1999
@@ -143,7 +143,7 @@
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = xbill.png
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
Games_DATA = xbill.desktop
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
