summaryrefslogtreecommitdiff
path: root/x11/gnomecore/files/patch-ae
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnomecore/files/patch-ae')
-rw-r--r--x11/gnomecore/files/patch-ae740
1 files changed, 50 insertions, 690 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-07 06:04:05 +0000