aboutsummaryrefslogtreecommitdiffstats
path: root/x11/gnomecore/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnomecore/files')
-rw-r--r--x11/gnomecore/files/patch-aa40
-rw-r--r--x11/gnomecore/files/patch-ab249
-rw-r--r--x11/gnomecore/files/patch-ae740
-rw-r--r--x11/gnomecore/files/patch-ah176
-rw-r--r--x11/gnomecore/files/patch-am123
-rw-r--r--x11/gnomecore/files/patch-an31
-rw-r--r--x11/gnomecore/files/patch-ap23
7 files changed, 538 insertions, 844 deletions
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index 6fc92a3d6671..f4586c109eec 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,15 +1,6 @@
---- configure.orig Fri Apr 9 18:03:33 1999
-+++ configure Sat May 22 21:21:21 1999
-@@ -3122,7 +3122,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
-- PTHREAD_LIB="-lc_r"
-+ PTHREAD_LIB=""
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -5098,7 +5098,7 @@
+--- configure.orig Tue May 23 00:35:01 2000
++++ configure Fri May 26 14:29:09 2000
+@@ -4885,7 +4885,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -18,11 +9,22 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -6269,6 +6269,7 @@
- case "$host" in
- *linux*) CDROM_HOST=linux;;
- *solaris*) CDROM_HOST=solaris;;
-+*freebsd*) CDROM_HOST=freebsd;;
- esac
-
+--- app-docs.make.orig Thu Apr 20 02:25:57 2000
++++ app-docs.make Fri May 26 16:31:01 2000
+@@ -1,4 +1,4 @@
+-helpdir = $(datadir)/gnome/help/$(app)/$(lang)
++helpdir = $(datadir)/help/$(app)/$(lang)
+ help_DATA = \
+ index.html \
+ topic.dat \
+--- applet-docs.make.orig Thu Apr 20 02:25:57 2000
++++ applet-docs.make Fri May 26 16:31:10 2000
+@@ -9,7 +9,7 @@
+ # figs = modemlights-advpref.png modemlights-prefs.png modemlights.png
+ # include $(top_srcdir)/applet-docs.make
+-docdir = $(datadir)/gnome/help/$(applet)_applet/$(lang)
++docdir = $(datadir)/help/$(applet)_applet/$(lang)
+ doc_DATA = \
+ index.html \
+ topic.dat \
diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab
index abaa03ca82de..72fcc097dcd6 100644
--- a/x11/gnomecore/files/patch-ab
+++ b/x11/gnomecore/files/patch-ab
@@ -1,25 +1,26 @@
---- help-browser/gnome-help-browser.c.orig Tue Dec 29 05:19:41 1998
-+++ help-browser/gnome-help-browser.c Tue Dec 29 05:20:50 1998
-@@ -72,13 +72,10 @@
+--- help-browser/gnome-help-browser.c.orig Sat May 13 12:16:14 2000
++++ help-browser/gnome-help-browser.c Fri May 26 14:31:15 2000
+@@ -81,14 +81,10 @@
void destroy_server(HelpWindow win);
/* MANPATH should probably come from somewhere */
--#define DEFAULT_MANPATH "/usr/man:/usr/local/man:/usr/X11R6/man"
--#define DEFAULT_INFOPATH "/usr/info:/usr/local/info"
-+#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
-+#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info"
+-#define DEFAULT_MANPATH GNOME_PREFIX "/man:/usr/man:/usr/share/man:/usr/local/man:/usr/X11R6/man"
+-#define DEFAULT_INFOPATH GNOME_PREFIX "/info:/usr/info:/usr/share/info:/usr/local/info"
++#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
++#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info"
/* GHELPPATH probably needs some automatic additions inside toc */
--#define DEFAULT_GHELPPATH GNOMEHELPPATH ":/opt/gnome/share/gnome/help:" \
+-#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \
+- "/opt/gnome/share/gnome/help:" \
- "/usr/local/share/gnome/help:" \
- "/usr/local/gnome/share/gnome/help:" \
-- "/usr/share/gnome/help:"
-+#define DEFAULT_GHELPPATH GNOMEHELPPATH
+- "/usr/share/gnome/help"
++#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help"
#define DEFAULT_MEMCACHESIZE "1000000"
#define DEFAULT_HISTORYLENGTH "1000"
#define HELP_BROWSER_RC_DIR ".gnome-help-browser"
---- help-browser/toc.c.orig Tue Dec 29 05:20:55 1998
-+++ help-browser/toc.c Tue Dec 29 05:21:48 1998
-@@ -19,14 +19,13 @@
+--- help-browser/toc.c.orig Thu May 4 06:54:33 2000
++++ help-browser/toc.c Fri May 26 14:32:55 2000
+@@ -20,14 +20,13 @@
static int hideTocInt(GtkWidget *window);
struct _toc_config toc_config[] = {
@@ -33,9 +34,225 @@
- { "/usr/local/gnome/share/gnome/help", TOC_GHELP_TYPE },
- { "/usr/share/gnome/help", TOC_GHELP_TYPE },
+ { "/usr/share/info", TOC_INFO_TYPE },
-+ { "/usr/local/info", TOC_INFO_TYPE },
-+ { "/usr/X11R6/info", TOC_INFO_TYPE },
-+ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE },
++ { "/usr/local/info", TOC_INFO_TYPE },
++ { "/usr/X11R6/info", TOC_INFO_TYPE },
++ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE },
{ NULL, 0 }
};
+--- help-browser/Makefile.in.orig Tue May 23 04:25:07 2000
++++ help-browser/Makefile.in Fri May 26 16:15:53 2000
+@@ -143,7 +143,7 @@
+
+ @HELP_USE_GTKHTML_TRUE@htmlcflags = -DHELP_USE_GTKHTML
+
+-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" $(htmlcflags)
++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" $(htmlcflags)
+
+ @HELP_USE_GTKHTML_TRUE@htmllibs = $(GNOME_XML_LIB) @PIXBUF_LIBS@ $(GTK_HTML_PREFIX)/lib/libgtkhtml.a $(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a
+ @HELP_USE_GTKHTML_FALSE@htmllibs = $(GTKXMHTML_LIBS)
+@@ -186,7 +186,7 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = help-browser.gnorba
+
+-sysdir = $(datadir)/gnome/apps
++sysdir = $(datadir)/apps
+ sys_DATA = gnome-help.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -558,7 +558,7 @@
+ help-caller.o gnome-help-browser.o: help-browser.h
+
+ install-exec-local:
+- $(INSTALL_PROGRAM) $(top_srcdir)/help-browser/gnome-download \
++ $(INSTALL_SCRIPT) $(top_srcdir)/help-browser/gnome-download \
+ $(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+--- help-browser/help/C/Makefile.in.orig Tue May 23 04:25:10 2000
++++ help-browser/help/C/Makefile.in Fri May 26 15:36:46 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/C
++help_browser_helpdir = $(datadir)/help/help-browser/C
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/ca/Makefile.in.orig Tue May 23 04:25:11 2000
++++ help-browser/help/ca/Makefile.in Fri May 26 15:36:57 2000
+@@ -143,7 +143,7 @@
+
+ EXTRA_DIST = default-page.html
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca
++help_browser_helpdir = $(datadir)/help/help-browser/ca
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/da/Makefile.in.orig Tue May 23 04:25:12 2000
++++ help-browser/help/da/Makefile.in Fri May 26 15:37:09 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/da
++help_browser_helpdir = $(datadir)/help/help-browser/da
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/el/Makefile.in.orig Tue May 23 04:25:13 2000
++++ help-browser/help/el/Makefile.in Fri May 26 15:37:16 2000
+@@ -143,7 +143,7 @@
+
+ EXTRA_DIST = default-page.html
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/el
++help_browser_helpdir = $(datadir)/help/help-browser/el
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/es/Makefile.in.orig Tue May 23 04:25:14 2000
++++ help-browser/help/es/Makefile.in Fri May 26 15:37:46 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/es
++help_browser_helpdir = $(datadir)/help/help-browser/es
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/et/Makefile.in.orig Tue May 23 04:25:15 2000
++++ help-browser/help/et/Makefile.in Fri May 26 15:37:53 2000
+@@ -143,7 +143,7 @@
+
+ EXTRA_DIST = default-page.html
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/et
++help_browser_helpdir = $(datadir)/help/help-browser/et
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/eu/Makefile.in.orig Tue May 23 04:25:16 2000
++++ help-browser/help/eu/Makefile.in Fri May 26 15:38:00 2000
+@@ -143,7 +143,7 @@
+
+ EXTRA_DIST = default-page.html
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu
++help_browser_helpdir = $(datadir)/help/help-browser/eu
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/fr/Makefile.in.orig Tue May 23 04:25:17 2000
++++ help-browser/help/fr/Makefile.in Fri May 26 15:38:09 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr
++help_browser_helpdir = $(datadir)/help/help-browser/fr
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/gl/Makefile.in.orig Tue May 23 04:25:18 2000
++++ help-browser/help/gl/Makefile.in Fri May 26 15:38:16 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/gl
++help_browser_helpdir = $(datadir)/help/help-browser/gl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/hu/Makefile.in.orig Tue May 23 04:25:18 2000
++++ help-browser/help/hu/Makefile.in Fri May 26 15:38:25 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu
++help_browser_helpdir = $(datadir)/help/help-browser/hu
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/it/Makefile.in.orig Tue May 23 04:25:19 2000
++++ help-browser/help/it/Makefile.in Fri May 26 15:38:37 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it
++help_browser_helpdir = $(datadir)/help/help-browser/it
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/ja/Makefile.in.orig Tue May 23 04:25:20 2000
++++ help-browser/help/ja/Makefile.in Fri May 26 15:38:47 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja
++help_browser_helpdir = $(datadir)/help/help-browser/ja
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/ko/Makefile.in.orig Tue May 23 04:25:21 2000
++++ help-browser/help/ko/Makefile.in Fri May 26 15:38:54 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko
++help_browser_helpdir = $(datadir)/help/help-browser/ko
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/lt/Makefile.in.orig Tue May 23 04:25:22 2000
++++ help-browser/help/lt/Makefile.in Fri May 26 15:39:03 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/lt
++help_browser_helpdir = $(datadir)/help/help-browser/lt
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/no/Makefile.in.orig Tue May 23 04:25:24 2000
++++ help-browser/help/no/Makefile.in Fri May 26 15:39:12 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no
++help_browser_helpdir = $(datadir)/help/help-browser/no
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/uk/Makefile.in.orig Tue May 23 04:25:25 2000
++++ help-browser/help/uk/Makefile.in Fri May 26 15:39:19 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/uk
++help_browser_helpdir = $(datadir)/help/help-browser/uk
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
+--- help-browser/help/wa/Makefile.in.orig Tue May 23 04:25:26 2000
++++ help-browser/help/wa/Makefile.in Fri May 26 15:39:27 2000
+@@ -142,7 +142,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
+
+
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa
++help_browser_helpdir = $(datadir)/help/help-browser/wa
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES =
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index 1ea686cf1c6d..797996b9e47a 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -1,713 +1,73 @@
---- applets/Makefile.in.orig Thu Sep 23 03:52:47 1999
-+++ applets/Makefile.in Fri Sep 24 10:59:30 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen life battery charpick gnome-pager mini-commander gkb jbc another_clock desk-guide tasklist
-+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen life battery charpick gnome-pager mini-commander gkb jbc another_clock desk-guide tasklist
-
- @FALSE_TRUE@esdmanager = esd-manager
- @FALSE_FALSE@esdmanager =
---- applets/asclock/Makefile.in.orig Sat Apr 10 01:11:04 1999
-+++ applets/asclock/Makefile.in Thu May 6 07:47:12 1999
-@@ -156,7 +156,7 @@
-
- SUBDIRS = themes default_theme
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DASCLOCK_THEMES_DIR=\""$(datadir)/asclock/"\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DASCLOCK_GNOME -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DASCLOCK_THEMES_DIR=\""$(datadir)/asclock/"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DASCLOCK_GNOME -DVERSION=\""$(VERSION)"\"
-
-
- bin_PROGRAMS = asclock_applet
---- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999
-+++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = battery_applet
---- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999
-+++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = cdplayer_applet
---- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999
-+++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = charpick_applet
---- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999
-+++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = clockmail_applet
---- applets/cpumemusage/Makefile.in.orig Thu Sep 23 03:54:10 1999
-+++ applets/cpumemusage/Makefile.in Fri Sep 24 11:01:36 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-
-
- bin_PROGRAMS = cpumemusage_applet
---- applets/desk-guide/Makefile.in.orig Thu Sep 23 03:54:03 1999
-+++ applets/desk-guide/Makefile.in Fri Sep 24 11:03:26 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+--- applets/gen_util/mailcheck.c.orig Thu May 18 03:16:03 2000
++++ applets/gen_util/mailcheck.c Fri May 26 15:08:01 2000
+@@ -1296,7 +1296,7 @@
+ if (!user)
+ return NULL;
+
+- mc->mail_file = g_strdup_printf ("/var/spool/mail/%s",
++ mc->mail_file = g_strdup_printf ("/var/mail/%s",
+ user);
+ } else
+ mc->mail_file = g_strdup (mc->mail_file);
+--- applets/desk-guide/Makefile.in.orig Tue May 23 04:25:59 2000
++++ applets/desk-guide/Makefile.in Fri May 26 15:21:53 2000
+@@ -141,7 +141,7 @@
+
+ SUBDIRS = help
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
bin_PROGRAMS = deskguide_applet
---- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999
-+++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-
-
- bin_PROGRAMS = dialer_applet
---- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999
-+++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-
-
- bin_PROGRAMS = diskusage_applet
---- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999
-+++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = drivemount_applet
---- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999
-+++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
+--- applets/fish/Makefile.in.orig Tue May 23 04:26:04 2000
++++ applets/fish/Makefile.in Fri May 26 16:23:15 2000
+@@ -139,7 +139,7 @@
+ gnomelocaledir = @gnomelocaledir@
l = @l@
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags)
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@
- bin_PROGRAMS = esdmanager_applet
---- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999
-+++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = fifteen_applet
---- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999
-+++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+ SUBDIRS = help
+@@ -187,7 +187,7 @@
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libfish_applet_la_LDFLAGS =
++libfish_applet_la_LDFLAGS = -version-info 4:0:0
+ libfish_applet_la_LIBADD =
+ libfish_applet_la_OBJECTS = fish.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- applets/gen_util/Makefile.in.orig Tue May 23 04:26:11 2000
++++ applets/gen_util/Makefile.in Fri May 26 16:23:39 2000
+@@ -141,7 +141,7 @@
-
- #if DO_EXE
---- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999
-+++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -153,9 +153,9 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--Utilitiesdir = $(datadir)/gnome/apps/Utilities
-+Utilitiesdir = $(datadir)/apps/Utilities
-
--INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = fvwm-pager
---- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999
-+++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+ SUBDIRS = help
-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
- bin_PROGRAMS = gen_util_applet
---- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999
-+++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- #if DO_EXE
---- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999
-+++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-
-
- bin_PROGRAMS = gnomepager_applet
---- applets/mini-commander/docs/Makefile.in.orig Sun Oct 3 16:35:27 1999
-+++ applets/mini-commander/docs/Makefile.in Mon Oct 4 13:24:50 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--docdir = $(datadir)/gnome/help/mini-commander_applet/C
-+docdir = $(datadir)/help/mini-commander_applet/C
- doc_DATA = index.html topic.dat
-
-
-@@ -238,7 +238,7 @@
- install: install-am
- uninstall-am: uninstall-docDATA
- uninstall: uninstall-am
--all-am: Makefile $(DATA)
-+all-am: Makefile
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
---- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999
-+++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = mini_commander_applet
---- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999
-+++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = mixer_applet
---- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999
-+++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-
-
- bin_PROGRAMS = modemlights_applet
---- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999
-+++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-+INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-
-
- bin_PROGRAMS = multiload_applet
---- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999
-+++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
-
-
- bin_PROGRAMS = netload_applet
---- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999
-+++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = slash_applet
---- applets/tasklist/Makefile.in.orig Thu Sep 23 03:54:05 1999
-+++ applets/tasklist/Makefile.in Fri Sep 24 11:04:32 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-
-
- bin_PROGRAMS = tasklist_applet
---- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999
-+++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = webcontrol_applet
---- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999
-+++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = winlist_applet
---- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999
-+++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999
-@@ -162,7 +162,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C
-+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C
-
- GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css
-
---- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999
-+++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--appsdir = $(datadir)/gnome/apps
-+appsdir = $(datadir)/apps
-
- Rootdir = $(appsdir)
- Applicationsdir = $(appsdir)/Applications
---- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999
-+++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = gmenu
-@@ -167,7 +167,7 @@
-
- EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm
-
--sysdir = $(datadir)/gnome/apps/Settings
-+sysdir = $(datadir)/apps/Settings
- sys_DATA = gmenu.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
---- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999
-+++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C
-
- gnome_terminal_help_DATA = index.html topic.dat
-
---- gnome-terminal/da/Makefile.in.orig Fri Dec 17 16:27:57 1999
-+++ gnome-terminal/da/Makefile.in Mon Dec 27 13:30:32 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/da
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/da
-
- gnome_terminal_help_DATA = index.html topic.dat
-
---- gnome-terminal/es/Makefile.in.orig Fri Dec 17 16:28:04 1999
-+++ gnome-terminal/es/Makefile.in Mon Dec 27 13:30:53 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/es
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/es
-
- gnome_terminal_help_DATA = index.html topic.dat
-
---- gnome-terminal/no/Makefile.in.orig Fri Dec 17 16:28:12 1999
-+++ gnome-terminal/no/Makefile.in Mon Dec 27 13:31:07 1999
-@@ -154,7 +154,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/no
-+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/no
-
- gnome_terminal_help_DATA = index.html topic.dat
-
---- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999
-+++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999
-@@ -155,9 +155,9 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
- SUBDIRS = C da es no
-
--INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\""
-+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
-
-
- LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS)
-@@ -174,7 +174,7 @@
-
- CFLAGS = @CFLAGS@ -Wall
-
--utildir = $(datadir)/gnome/apps/Utilities
-+utildir = $(datadir)/apps/Utilities
- util_DATA = gnome-terminal.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
---- gsm/Makefile.in.orig Thu Sep 23 03:51:28 1999
-+++ gsm/Makefile.in Fri Sep 24 11:33:32 1999
-@@ -153,9 +153,9 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
-
--INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\""
-+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(datadir)\""
-
-
- LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
-@@ -178,7 +178,7 @@
-
- default_DATA = default.session default.wm
-
--desktopdir = $(datadir)/gnome/apps/Settings
-+desktopdir = $(datadir)/apps/Settings
- desktop_DATA = save-session.desktop session.desktop
-
- EXTRA_DIST = default.in default.wm.in gnome-wm save-session.desktop session.desktop
---- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999
-+++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999
-@@ -156,7 +156,7 @@
-
- SUBDIRS = help gnome-man2html gnome-info2html
-
--INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\"
-
-
- LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS)
-@@ -197,7 +197,7 @@
- gnorbadir = $(sysconfdir)/CORBA/servers
- gnorba_DATA = help-browser.gnorba
-
--sysdir = $(datadir)/gnome/apps
-+sysdir = $(datadir)/apps
- sys_DATA = gnome-help.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
---- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999
-+++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/C
-+help_browser_helpdir = $(datadir)/help/help-browser/C
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/ca/Makefile.in.orig Thu Sep 23 03:52:01 1999
-+++ help-browser/help/ca/Makefile.in Fri Sep 24 11:29:22 1999
-@@ -157,7 +157,7 @@
-
- EXTRA_DIST = default-page.html
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca
-+help_browser_helpdir = $(datadir)/help/help-browser/ca
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/da/Makefile.in.orig Fri Dec 17 16:26:15 1999
-+++ help-browser/help/da/Makefile.in Mon Dec 27 13:50:51 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/da
-+help_browser_helpdir = $(datadir)/help/help-browser/da
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/el/Makefile.in.orig Fri Dec 17 16:26:21 1999
-+++ help-browser/help/el/Makefile.in Mon Dec 27 13:51:00 1999
-@@ -158,7 +158,7 @@
-
- EXTRA_DIST = default-page.html
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/el
-+help_browser_helpdir = $(datadir)/help/help-browser/el
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999
-+++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/es
-+help_browser_helpdir = $(datadir)/help/help-browser/es
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/et/Makefile.in.orig Thu Sep 23 03:52:05 1999
-+++ help-browser/help/et/Makefile.in Fri Sep 24 11:29:43 1999
-@@ -157,7 +157,7 @@
-
- EXTRA_DIST = default-page.html
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/et
-+help_browser_helpdir = $(datadir)/help/help-browser/et
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/eu/Makefile.in.orig Thu Sep 23 03:52:06 1999
-+++ help-browser/help/eu/Makefile.in Fri Sep 24 11:29:56 1999
-@@ -157,7 +157,7 @@
-
- EXTRA_DIST = default-page.html
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu
-+help_browser_helpdir = $(datadir)/help/help-browser/eu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999
-+++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr
-+help_browser_helpdir = $(datadir)/help/help-browser/fr
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999
-+++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu
-+help_browser_helpdir = $(datadir)/help/help-browser/hu
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999
-+++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/it
-+help_browser_helpdir = $(datadir)/help/help-browser/it
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/ja/Makefile.in.orig Thu Sep 23 03:52:14 1999
-+++ help-browser/help/ja/Makefile.in Fri Sep 24 11:30:09 1999
-@@ -156,7 +156,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja
-+help_browser_helpdir = $(datadir)/help/help-browser/ja
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/ko/Makefile.in.orig Tue Mar 2 01:52:46 1999
-+++ help-browser/help/ko/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko
-+help_browser_helpdir = $(datadir)/help/help-browser/ko
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999
-+++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999
-@@ -157,7 +157,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/no
-+help_browser_helpdir = $(datadir)/help/help-browser/no
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- help-browser/help/wa/Makefile.in.orig Wed Jun 23 17:38:49 1999
-+++ help-browser/help/wa/Makefile.in Mon Jul 12 14:34:30 1999
-@@ -159,7 +159,7 @@
- EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html
-
-
--help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa
-+help_browser_helpdir = $(datadir)/help/help-browser/wa
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =
---- panel/Makefile.in.orig Fri Dec 17 16:28:45 1999
-+++ panel/Makefile.in Wed Feb 23 13:50:04 2000
-@@ -160,7 +160,7 @@
-
- AUTOMAKE_OPTIONS = 1.3
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS)
-
-
- bin_PROGRAMS = panel
+ lib_LTLIBRARIES = libgen_util_applet.la
@@ -181,7 +181,7 @@
- libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h
-
-
--libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libpanel_applet_la_LDFLAGS = -version-info 2:0:0
- libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
-
- BUILT_SOURCES = $(CORBA_SRCLIST)
-@@ -213,7 +213,7 @@
- EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING bad-applet.desktop bad-applet.goad
-
-
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = appletsConf.sh
-
- panelgnorbadir = $(sysconfdir)/CORBA/servers
-@@ -670,6 +670,7 @@
- sed -e 's?\@GNOME_LIBDIR\@?$(GNOME_LIBDIR)?g' \
- -e 's?\@GNOME_INCLUDEDIR\@?$(GNOME_INCLUDEDIR)?g' \
- -e 's?\@GNOMEGNORBA_LIBS\@?$(GNOMEGNORBA_LIBS)?g' \
-+ -e 's?\@VERSION\@?$(VERSION)?g' \
- < $(srcdir)/appletsConf.sh.in > appletsConf.tmp \
- && mv appletsConf.tmp appletsConf.sh
-
---- panel/appletsConf.sh.in.orig Mon Feb 8 11:13:15 1999
-+++ panel/appletsConf.sh.in Wed Feb 23 13:52:32 2000
-@@ -4,3 +4,4 @@
- APPLETS_LIBDIR="@GNOME_LIBDIR@"
- APPLETS_LIBS="-lpanel_applet @GNOMEGNORBA_LIBS@"
- APPLETS_INCLUDEDIR="@GNOME_INCLUDEDIR@"
-+MODULE_VERSION="applets-@VERSION@"
---- applets/another_clock/Makefile.in.orig Sat Oct 16 13:03:28 1999
-+++ applets/another_clock/Makefile.in Sat Oct 16 13:03:38 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgen_util_applet_la_LDFLAGS =
++libgen_util_applet_la_LDFLAGS = -version-info 4:0:0
+ libgen_util_applet_la_LIBADD =
+ libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \
+ printer.lo clock.lo
+--- applets/tasklist/Makefile.in.orig Tue May 23 04:26:26 2000
++++ applets/tasklist/Makefile.in Fri May 26 15:24:07 2000
+@@ -141,7 +141,7 @@
+ SUBDIRS = help
- bin_PROGRAMS = another_clock_applet
---- applets/icewm-pager/Makefile.in.orig Sat Oct 16 13:05:16 1999
-+++ applets/icewm-pager/Makefile.in Sat Oct 16 13:05:53 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\"
-
-
- bin_PROGRAMS = wmpager_applet
---- applets/life/Makefile.in.orig Sat Oct 16 13:06:24 1999
-+++ applets/life/Makefile.in Sat Oct 16 13:06:34 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
- bin_PROGRAMS = life_applet
---- applets/jbc/Makefile.in.orig Sat Oct 16 13:12:59 1999
-+++ applets/jbc/Makefile.in Sat Oct 16 13:13:12 1999
-@@ -153,7 +153,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
-
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
-
-
- bin_PROGRAMS = jbc_applet
+ bin_PROGRAMS = tasklist_applet
diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah
index 1b86dd17e0d9..afe5c26501d2 100644
--- a/x11/gnomecore/files/patch-ah
+++ b/x11/gnomecore/files/patch-ah
@@ -1,17 +1,72 @@
---- gmenu/main.c.orig Thu May 6 11:44:25 1999
-+++ gmenu/main.c Thu May 6 11:44:43 1999
-@@ -271,7 +271,7 @@
-
- gnome_init ("GNOME menu editor", VERSION, argc, argv);
-
-- system_apps_dir = gnome_unconditional_datadir_file("gnome/apps");
-+ system_apps_dir = gnome_unconditional_datadir_file("apps");
- system_pixmap_dir = gnome_unconditional_datadir_file("pixmaps");
- if (!g_file_exists(system_apps_dir) || !g_file_exists(system_pixmap_dir))
- {
---- panel/menu.c.orig Mon Sep 20 18:49:14 1999
-+++ panel/menu.c Fri Sep 24 10:55:55 1999
-@@ -504,7 +504,7 @@
+--- panel/Makefile.in.orig Tue May 23 04:25:47 2000
++++ panel/Makefile.in Fri May 26 15:30:48 2000
+@@ -147,7 +147,7 @@
+
+ SUBDIRS = doc help
+
+-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@
++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@
+
+
+ bin_PROGRAMS = panel gnome-panel-properties-capplet
+@@ -169,7 +169,7 @@
+ libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h
+
+
+-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
++libpanel_applet_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir)
+ libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
+
+ libpanel_status_la_SOURCES = status-docklet.c $(CORBA_SRCLIST)
+@@ -178,7 +178,7 @@
+ libpanel_statusinclude_HEADERS = status-docklet.h
+
+
+-libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
++libpanel_status_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir)
+ libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
+
+ BUILT_SOURCES = $(CORBA_SRCLIST)
+@@ -210,7 +210,7 @@
+ EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in dockletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING panel.hints gnome-panel-properties.desktop nothing.cP title-item.gob
+
+
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = appletsConf.sh dockletsConf.sh
+
+ panelgnorbadir = $(sysconfdir)/CORBA/servers
+@@ -219,13 +219,13 @@
+ soundlistdir = $(sysconfdir)/sound/events
+ soundlist_DATA = panel.soundlist
+
+-hintsdir = $(datadir)/gnome/hints
++hintsdir = $(datadir)/hints
+ hints_DATA = panel.hints
+
+ sysdir = $(datadir)/control-center/Desktop/
+ sys_DATA = gnome-panel-properties.desktop
+
+-deskdir = $(datadir)/gnome/apps/Settings/Desktop/
++deskdir = $(datadir)/apps/Settings/Desktop/
+ desk_DATA = gnome-panel-properties.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+
+--- panel/foobar-widget.c.orig Sat May 6 20:48:27 2000
++++ panel/foobar-widget.c Wed May 31 12:51:56 2000
+@@ -557,7 +557,7 @@
+
+ append_folder_menu (menu_bar, _("Favorites"), NULL, FALSE, "apps/.");
+ append_folder_menu (menu_bar, _("Settings"), NULL, TRUE,
+- "gnome/apps/Settings/.");
++ "apps/Settings/.");
+ append_desktop_menu (menu_bar);
+
+ gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0);
+--- panel/menu.c.orig Tue May 23 01:00:43 2000
++++ panel/menu.c Fri May 26 15:10:21 2000
+@@ -82,7 +82,7 @@
/*just load the menus from disk, don't make the widgets
this just reads the .desktops of the top most directory
and a level down*/
@@ -20,39 +75,62 @@
if(menu)
fr_read_dir(NULL,menu,NULL,2);
g_free(menu);
-@@ -2078,7 +2078,7 @@
- static GtkWidget *
- create_system_menu(GtkWidget *menu, int fake_submenus, int fake)
+@@ -2709,7 +2709,7 @@
+ create_system_menu(GtkWidget *menu, gboolean fake_submenus, gboolean fake,
+ gboolean title)
+ {
+- char *menudir = gnome_datadir_file ("gnome/apps");
++ char *menudir = gnome_datadir_file ("apps");
+
+ if (menudir &&
+ g_file_test (menudir, G_FILE_TEST_ISDIR)) {
+@@ -3598,8 +3598,8 @@
+ gtk_menu_append (GTK_MENU (submenu), submenuitem);
+ gtk_signal_connect(GTK_OBJECT(submenuitem), "activate",
+ GTK_SIGNAL_FUNC(add_menu_to_panel),
+- "gnome/apps/");
+- setup_internal_applet_drag(submenuitem, "MENU:gnome/apps/");
++ "apps/");
++ setup_internal_applet_drag(submenuitem, "MENU:apps/");
+
+ submenuitem = gtk_menu_item_new ();
+ gtk_widget_lock_accelerators (menuitem);
+--- panel/menu-properties.c.orig Mon Apr 3 18:03:29 2000
++++ panel/menu-properties.c Wed May 31 12:50:41 2000
+@@ -40,7 +40,7 @@
+ arguments = ".";
+
+ if(strcmp(arguments,".")==0)
+- this_menu = gnome_unconditional_datadir_file ("gnome/apps");
++ this_menu = gnome_unconditional_datadir_file ("apps");
+ else if (*arguments == '/')
+ this_menu = g_strdup (arguments);
+ else if (*arguments == '~')
+--- panel/session.c.orig Fri May 19 00:29:47 2000
++++ panel/session.c Wed May 31 12:49:09 2000
+@@ -777,10 +777,10 @@
+ load_default_applets1(PanelWidget *panel)
{
-- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
-+ char *menu_base = gnome_unconditional_datadir_file ("apps");
- char *menudir, *pixmap;
-
- menudir = g_concat_dir_and_file (menu_base, ".");
-@@ -3111,7 +3111,7 @@
- current_panel = PANEL_WIDGET(menu->button->parent);
-
- if(!menu->menu) {
-- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
-+ char *menu_base = gnome_unconditional_datadir_file ("apps");
- char *this_menu = get_real_menu_path(menu->path,menu_base);
- GSList *list = g_slist_append(NULL,this_menu);
-
-@@ -3220,7 +3220,7 @@
- Menu *menu;
- int main_menu;
-
-- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
-+ char *menu_base = gnome_unconditional_datadir_file ("apps");
- char *this_menu = get_real_menu_path(arguments,menu_base);
-
- if (!this_menu) {
-@@ -3340,7 +3340,7 @@
- menu->menu = NULL;
-
- {
-- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps");
-+ char *menu_base = gnome_unconditional_datadir_file ("apps");
- char *this_menu = get_real_menu_path(menu->path,menu_base);
- GSList *list = g_slist_append(NULL,this_menu);
- char *pixmap_name = get_pixmap(this_menu,
+ char *def_launchers[] =
+- { "gnome/apps/gnome-help.desktop",
+- "gnome/apps/System/gnome-terminal.desktop",
+- "gnome/apps/Settings/gnomecc.desktop",
+- "gnome/apps/Internet/Netscape.desktop",
++ { "apps/gnome-help.desktop",
++ "apps/System/gnome-terminal.desktop",
++ "apps/Settings/gnomecc.desktop",
++ "apps/Internet/Netscape.desktop",
+ NULL };
+ int i;
+ char *p;
+--- panel/doc/Makefile.in.orig Tue May 23 04:25:49 2000
++++ panel/doc/Makefile.in Fri May 26 16:45:35 2000
+@@ -150,7 +150,7 @@
+ CFLAGS = "`gnome-config --cflags gnomeui applets docklets`"
+ LDFLAGS = "`gnome-config --libs gnomeui applets docklets`"
+
+-HTML_DIR = $(datadir)/gnome/html
++HTML_DIR = $(datadir)/html
+
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+
diff --git a/x11/gnomecore/files/patch-am b/x11/gnomecore/files/patch-am
index 5519ed43f554..63410295e912 100644
--- a/x11/gnomecore/files/patch-am
+++ b/x11/gnomecore/files/patch-am
@@ -1,86 +1,69 @@
---- gnome-terminal/gnome-terminal.c.orig Thu Nov 11 18:05:12 1999
-+++ gnome-terminal/gnome-terminal.c Thu Jan 20 17:00:49 2000
-@@ -480,6 +480,7 @@
- cfg->color_type = PALETTE_CUSTOM;
+--- gnome-terminal/gnome-terminal.c.orig Fri May 19 23:38:07 2000
++++ gnome-terminal/gnome-terminal.c Fri May 26 15:15:38 2000
+@@ -507,7 +507,7 @@
else
cfg->color_type = PALETTE_LINUX;
-+ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0");
- cfg->bell = gnome_config_get_bool ("bell_silenced=0");
- cfg->blink = gnome_config_get_bool ("blinking=0");
- cfg->swap_keys = gnome_config_get_bool ("swap_del_and_backspace=0");
-@@ -507,7 +508,8 @@
- cfg->termname = NULL;
- cfg->terminal_id = 0;
-
-- cfg->update_records = ZVT_TERM_DO_UTMP_LOG|ZVT_TERM_DO_WTMP_LOG;
-+ cfg->update_records = ZVT_TERM_DO_UTMP_LOG | ZVT_TERM_DO_WTMP_LOG
-+ | ZVT_TERM_DO_LASTLOG;
-
- if (strcasecmp (fore_color, back_color) == 0)
- /* don't let them set identical foreground and background colors */
-@@ -994,6 +996,7 @@
- gnome_config_set_string ("scrollpos",
+
+- cfg->keyboard_secured = FALSE;
++ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0");
+
+ cfg->bell = gnome_config_get_bool ("bell_silenced=0");
+ cfg->blink = gnome_config_get_bool ("blinking=0");
+@@ -1028,6 +1028,7 @@
cfg->scrollbar_position == SCROLLBAR_LEFT ? "left" :
cfg->scrollbar_position == SCROLLBAR_RIGHT ? "right" : "hidden");
+
+ gnome_config_set_bool ("keyboard_secured", cfg->keyboard_secured);
gnome_config_set_bool ("bell_silenced", cfg->bell);
gnome_config_set_bool ("blinking", cfg->blink);
gnome_config_set_bool ("swap_del_and_backspace", cfg->swap_keys);
-@@ -2260,6 +2263,8 @@
- cfg->update_records |= ZVT_TERM_DO_UTMP_LOG;
- if (gnome_config_get_bool ("do_wtmp=true"))
- cfg->update_records |= ZVT_TERM_DO_WTMP_LOG;
-+ if (gnome_config_get_bool ("do_lastlog=true"))
-+ cfg->update_records |= ZVT_TERM_DO_LASTLOG;
-
- termid = gnome_config_get_int("terminal_id=-1");
- if (termid!=-1)
-@@ -2367,6 +2372,7 @@
- gnome_config_set_string("window_title", cfg->window_title?cfg->window_title:"Terminal");
- gnome_config_set_bool("do_utmp", (cfg->update_records & ZVT_TERM_DO_UTMP_LOG) != 0);
- gnome_config_set_bool("do_wtmp", (cfg->update_records & ZVT_TERM_DO_WTMP_LOG) != 0);
-+ gnome_config_set_bool("do_lastlog", (cfg->update_records & ZVT_TERM_DO_LASTLOG) != 0);
-
- gnome_config_pop_prefix ();
- g_free (prefix);
-@@ -2417,8 +2423,10 @@
+@@ -2544,12 +2545,12 @@
DONOUTMP_KEY = -10,
DOWTMP_KEY = -11,
DONOWTMP_KEY = -12,
- TITLE_KEY = -13,
-- TERM_KEY = -14
-+ DOLASTLOG_KEY = -13,
-+ DONOLASTLOG_KEY = -14,
-+ TITLE_KEY = -15,
-+ TERM_KEY = -16
+- TERM_KEY = -14,
+- START_FACTORY_KEY= -15,
+- USE_FACTORY_KEY = -16,
+- DOLASTLOG_KEY = -17,
+- DONOLASTLOG_KEY = -18,
++ DOLASTLOG_KEY = -13,
++ DONOLASTLOG_KEY = -14,
++ TITLE_KEY = -15,
++ TERM_KEY = -16,
++ START_FACTORY_KEY= -17,
++ USE_FACTORY_KEY = -18
};
static struct poptOption cb_options [] = {
-@@ -2462,6 +2470,12 @@
+--- gnome-terminal/Makefile.in.orig Tue May 23 04:25:29 2000
++++ gnome-terminal/Makefile.in Fri May 26 15:46:43 2000
+@@ -143,7 +143,7 @@
+
+ SUBDIRS = C de da es it no
+
+-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\""
++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\""
+
+
+ LDADD = $(GNOME_LIBDIR) $(GNORBA_LIBS) $(ORB_LIBS) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS)
+@@ -167,7 +167,7 @@
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = gnome-terminal.gnorba
+
+-utildir = $(datadir)/gnome/apps/System
++utildir = $(datadir)/apps/System
+ util_DATA = gnome-terminal.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- gnome-terminal/de/Makefile.in.orig Tue May 23 04:25:31 2000
++++ gnome-terminal/de/Makefile.in Fri May 26 15:53:04 2000
+@@ -139,7 +139,7 @@
+ gnomelocaledir = @gnomelocaledir@
+ l = @l@
+
+-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/de
++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/de
+
+ gnome_terminal_help_DATA = index.html topic.dat
- { "nowtmp", '\0', POPT_ARG_NONE, NULL, DONOWTMP_KEY,
- N_("Do not update wtmp entry"), N_("NOWTMP") },
-+
-+ { "lastlog", '\0', POPT_ARG_NONE, NULL, DOLASTLOG_KEY,
-+ N_("Update lastlog entry"), N_("LASTLOG") },
-+
-+ { "nolastlog", '\0', POPT_ARG_NONE, NULL, DONOLASTLOG_KEY,
-+ N_("Do not update lastlog entry"), N_("NOLASTLOG") },
-
- { "title", 't', POPT_ARG_STRING, NULL, TITLE_KEY,
- N_("Set the window title"), N_("TITLE") },
-@@ -2538,6 +2552,14 @@
- case DONOWTMP_KEY:
- cfg->update_records_and &= ~ZVT_TERM_DO_WTMP_LOG;
- cfg->update_records_xor &= ~ZVT_TERM_DO_WTMP_LOG;
-+ break;
-+ case DOLASTLOG_KEY:
-+ cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG;
-+ cfg->update_records_xor |= ZVT_TERM_DO_LASTLOG;
-+ break;
-+ case DONOLASTLOG_KEY:
-+ cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG;
-+ cfg->update_records_xor &= ~ZVT_TERM_DO_LASTLOG;
- break;
- case TITLE_KEY:
- cfg->window_title = g_strdup(arg);
diff --git a/x11/gnomecore/files/patch-an b/x11/gnomecore/files/patch-an
new file mode 100644
index 000000000000..79a9c69d2695
--- /dev/null
+++ b/x11/gnomecore/files/patch-an
@@ -0,0 +1,31 @@
+--- gmenu/Makefile.in.orig Tue May 23 04:25:39 2000
++++ gmenu/Makefile.in Fri May 26 15:25:26 2000
+@@ -139,7 +139,7 @@
+ gnomelocaledir = @gnomelocaledir@
+ l = @l@
+
+-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR)
++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR)
+
+
+ bin_PROGRAMS = gmenu
+@@ -152,7 +152,7 @@
+
+ EXTRA_DIST = gmenu.desktop top.xpm unknown.xpm
+
+-sysdir = $(datadir)/gnome/apps/Settings
++sysdir = $(datadir)/apps/Settings
+ sys_DATA = gmenu.desktop
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+--- gmenu/main.c.orig Wed May 10 01:36:16 2000
++++ gmenu/main.c Fri May 26 15:09:49 2000
+@@ -276,7 +276,7 @@
+ gnome_init ("GNOME menu editor", VERSION, argc, argv);
+ gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-gmenu.png");
+
+- system_apps_dir = gnome_datadir_file("gnome/apps");
++ system_apps_dir = gnome_datadir_file("apps");
+ system_applets_dir = gnome_datadir_file("applets");
+ system_pixmap_dir = gnome_datadir_file("pixmaps");
+ if (!system_apps_dir || !system_pixmap_dir || !system_applets_dir)
diff --git a/x11/gnomecore/files/patch-ap b/x11/gnomecore/files/patch-ap
new file mode 100644
index 000000000000..a1e81ad131bd
--- /dev/null
+++ b/x11/gnomecore/files/patch-ap
@@ -0,0 +1,23 @@
+--- gsm/Makefile.in.orig Tue May 23 04:24:59 2000
++++ gsm/Makefile.in Fri May 26 15:28:56 2000
+@@ -141,9 +141,9 @@
+
+ SUBDIRS = help
+
+-defaultdir = $(datadir)/gnome
++defaultdir = $(datadir)
+
+-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\""
++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(defaultdir)\""
+
+
+ LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
+@@ -169,7 +169,7 @@
+
+ default_DATA = default.session default.wm
+
+-desktopdir = $(datadir)/gnome/apps/Settings/Session/
++desktopdir = $(datadir)/apps/Settings/Session/
+ desktop_DATA = save-session.desktop session.desktop
+
+ man_MANS = gnome-wm.1 save-session.1 default.session.5 gnome-session.1