diff options
Diffstat (limited to 'x11/gnomecore/files/patch-ae')
-rw-r--r-- | x11/gnomecore/files/patch-ae | 449 |
1 files changed, 222 insertions, 227 deletions
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index c459b7c998c4..923268b869e0 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -1,259 +1,305 @@ ---- applets/asclock/Makefile.in.orig Sat Sep 26 23:49:56 1998 -+++ applets/asclock/Makefile.in Sat Sep 26 23:50:23 1998 -@@ -145,7 +145,7 @@ - - INCLUDES = -I. -I$(srcdir) \ +--- applets/asclock/Makefile.in.orig Thu Dec 31 01:54:57 1998 ++++ applets/asclock/Makefile.in Fri Jan 1 11:47:02 1999 +@@ -152,7 +152,7 @@ + -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) $(GNOME_INCLUDEDIR) \ + -DVERSION=\""$(VERSION)"\" - bin_PROGRAMS = asclock_applet ---- applets/batmon/Makefile.in.orig Thu Sep 24 09:00:17 1998 -+++ applets/batmon/Makefile.in Sat Sep 26 23:48:33 1998 -@@ -148,7 +148,7 @@ - INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ +--- applets/batmon/Makefile.in.orig Thu Dec 31 01:54:56 1998 ++++ applets/batmon/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -155,7 +155,7 @@ + -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = batmon_applet ---- applets/battery/Makefile.in.orig Thu Sep 24 09:00:37 1998 -+++ applets/battery/Makefile.in Sat Sep 26 23:48:33 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ +--- applets/battery/Makefile.in.orig Thu Dec 31 01:55:03 1998 ++++ applets/battery/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -153,7 +153,7 @@ + -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = battery_applet ---- applets/bussign/Makefile.in.orig Thu Sep 24 09:00:56 1998 -+++ applets/bussign/Makefile.in Sat Sep 26 23:48:33 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/bussign/Makefile.in.orig Thu Dec 31 01:55:12 1998 ++++ applets/bussign/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = bussign_applet ---- applets/cdplayer/Makefile.in.orig Thu Sep 24 09:00:47 1998 -+++ applets/cdplayer/Makefile.in Sat Sep 26 23:48:33 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/cdplayer/Makefile.in.orig Thu Dec 31 01:55:14 1998 ++++ applets/cdplayer/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = cdplayer_applet ---- applets/charpick/Makefile.in.orig Sat Sep 26 23:50:49 1998 -+++ applets/charpick/Makefile.in Sat Sep 26 23:51:05 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/charpick/Makefile.in.orig Thu Dec 31 01:55:04 1998 ++++ applets/charpick/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = charpick_applet ---- applets/clockmail/Makefile.in.orig Thu Sep 24 09:00:33 1998 -+++ applets/clockmail/Makefile.in Sat Sep 26 23:48:33 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/clockmail/Makefile.in.orig Thu Dec 31 01:55:01 1998 ++++ applets/clockmail/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = clockmail_applet ---- applets/cpuload/Makefile.in.orig Thu Sep 24 09:00:40 1998 -+++ applets/cpuload/Makefile.in Sat Sep 26 23:51:47 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/cpumemusage/Makefile.in.orig Thu Dec 31 01:55:09 1998 ++++ applets/cpumemusage/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) \ -I$(LIBGTOP_INCS) ---- applets/cpumemusage/Makefile.in.orig Thu Sep 24 09:00:41 1998 -+++ applets/cpumemusage/Makefile.in Sat Sep 26 23:52:15 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/dialer/Makefile.in.orig Thu Dec 31 01:54:58 1998 ++++ applets/dialer/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) \ - -I$(LIBGTOP_INCS) + -DVERSION=\""$(VERSION)"\" ---- applets/dialer/Makefile.in.orig Thu Sep 24 09:00:26 1998 -+++ applets/dialer/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/diskusage/Makefile.in.orig Thu Dec 31 01:55:09 1998 ++++ applets/diskusage/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - bin_PROGRAMS = dialer_applet ---- applets/diskusage/Makefile.in.orig Thu Sep 24 09:00:43 1998 -+++ applets/diskusage/Makefile.in Sat Sep 26 23:52:41 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ + bin_PROGRAMS = diskusage_applet +--- applets/drivemount/Makefile.in.orig Thu Dec 31 01:55:01 1998 ++++ applets/drivemount/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) + -I$(includedir) $(GNOME_INCLUDEDIR) - bin_PROGRAMS = diskusage_applet ---- applets/drivemount/Makefile.in.orig Thu Sep 24 09:00:32 1998 -+++ applets/drivemount/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ + bin_PROGRAMS = drivemount_applet +--- applets/esd-manager/Makefile.in.orig Thu Dec 31 01:55:08 1998 ++++ applets/esd-manager/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,8 +152,8 @@ -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) + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) ++ -I$(includedir) $(GNOME_INCLUDEDIR) `esd-config --cflags` - bin_PROGRAMS = drivemount_applet ---- applets/fifteen/Makefile.in.orig Thu Sep 24 09:00:35 1998 -+++ applets/fifteen/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ + bin_PROGRAMS = esdmanager_applet + +--- applets/fifteen/Makefile.in.orig Thu Dec 31 01:55:02 1998 ++++ applets/fifteen/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = fifteen_applet ---- applets/fish/Makefile.in.orig Thu Sep 24 09:00:22 1998 -+++ applets/fish/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/fish/Makefile.in.orig Thu Dec 31 01:54:57 1998 ++++ applets/fish/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) - bin_PROGRAMS = fish_applet ---- applets/gen_util/Makefile.in.orig Thu Sep 24 09:00:15 1998 -+++ applets/gen_util/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ + #if DO_EXE +--- applets/fvwm-pager/Makefile.in.orig Thu Dec 31 01:55:17 1998 ++++ applets/fvwm-pager/Makefile.in Fri Jan 1 11:46:06 1999 +@@ -156,7 +156,7 @@ + -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(srcdir)/../../../panel \ + -I$(top_builddir)/panel \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ + -I$(includedir) $(GNOME_INCLUDEDIR) + + bin_PROGRAMS = fvwm-pager +--- applets/gen_util/Makefile.in.orig Thu Dec 31 01:54:55 1998 ++++ applets/gen_util/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gen_util_applet ---- applets/icewm-pager/Makefile.in.orig Thu Sep 24 09:00:30 1998 -+++ applets/icewm-pager/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ +--- applets/gnome-pager/Makefile.in.orig Thu Dec 31 01:55:04 1998 ++++ applets/gnome-pager/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ + -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ + -I$(includedir) $(GNOME_INCLUDEDIR) \ + -DVERSION=\""$(VERSION)"\" + +--- applets/gticker/Makefile.in.orig Thu Dec 31 01:55:12 1998 ++++ applets/gticker/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -150,7 +150,7 @@ + INCLUDES = -I. -I$(srcdir) \ + -I$(srcdir)/../../panel \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ + -I$(top_builddir)/panel \ + -I$(includedir) $(GNOME_INCLUDEDIR) + +--- applets/icewm-pager/Makefile.in.orig Thu Dec 31 01:55:00 1998 ++++ applets/icewm-pager/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ + -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ + -I$(includedir) $(GNOME_INCLUDEDIR) \ + -DVERSION=\""$(VERSION)"\" + +--- applets/mini-commander/Makefile.in.orig Thu Dec 31 01:55:07 1998 ++++ applets/mini-commander/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -156,7 +156,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) - bin_PROGRAMS = wmpager_applet ---- applets/mixer/Makefile.in.orig Thu Sep 24 09:00:50 1998 -+++ applets/mixer/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ + bin_PROGRAMS = mini_commander_applet +--- applets/mixer/Makefile.in.orig Thu Dec 31 01:55:15 1998 ++++ applets/mixer/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = mixer_applet ---- applets/modemlights/Makefile.in.orig Thu Sep 24 09:00:52 1998 -+++ applets/modemlights/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/modemlights/Makefile.in.orig Thu Dec 31 01:55:15 1998 ++++ applets/modemlights/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) $(GNOME_INCLUDEDIR) \ + -DVERSION=\""$(VERSION)"\" - bin_PROGRAMS = modemlights_applet ---- applets/multiload/Makefile.in.orig Sat Sep 26 23:53:03 1998 -+++ applets/multiload/Makefile.in Sat Sep 26 23:53:17 1998 -@@ -144,7 +144,7 @@ +--- applets/multiload/Makefile.in.orig Thu Dec 31 01:55:10 1998 ++++ applets/multiload/Makefile.in Fri Jan 1 11:47:27 1999 +@@ -149,7 +149,7 @@ l = @l@ INCLUDES = -I. -I$(srcdir) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel -I$(srcdir)/../../panel \ -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) ---- applets/netload/Makefile.in.orig Thu Sep 24 09:00:25 1998 -+++ applets/netload/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/netload/Makefile.in.orig Thu Dec 31 01:55:11 1998 ++++ applets/netload/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) + -I$(includedir) $(GNOME_INCLUDEDIR) \ + $(LIBGTOP_INCS) - bin_PROGRAMS = netload_applet ---- applets/webcontrol/Makefile.in.orig Thu Sep 24 09:00:28 1998 -+++ applets/webcontrol/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ +--- applets/slashapp/Makefile.in.orig Thu Dec 31 01:55:13 1998 ++++ applets/slashapp/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -151,7 +151,7 @@ INCLUDES = -I. -I$(srcdir) \ + -I$(srcdir)/../../panel \ + -I$(top_builddir)/panel \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ + -I$(includedir) $(GNOME_INCLUDEDIR) + + bin_PROGRAMS = slash_applet +--- applets/webcontrol/Makefile.in.orig Thu Dec 31 01:54:59 1998 ++++ applets/webcontrol/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = webcontrol_applet ---- applets/winlist/Makefile.in.orig Thu Sep 24 09:00:54 1998 -+++ applets/winlist/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ +--- applets/winlist/Makefile.in.orig Thu Dec 31 01:55:16 1998 ++++ applets/winlist/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -152,7 +152,7 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = winlist_applet ---- desktop-properties/Makefile.in.orig Thu Sep 24 08:59:56 1998 -+++ desktop-properties/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -144,7 +144,7 @@ - l = @l@ - - INCLUDES = \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -I$(includedir) $(X_CFLAGS) $(GNOME_INCLUDEDIR) - ---- gmenu/Makefile.in.orig Thu Sep 24 09:00:07 1998 -+++ gmenu/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -144,7 +144,7 @@ +--- gmenu/Makefile.in.orig Thu Dec 31 01:54:52 1998 ++++ gmenu/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -149,7 +149,7 @@ l = @l@ INCLUDES = \ @@ -262,9 +308,9 @@ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(includedir) $(GNOME_INCLUDEDIR) ---- gnome-terminal/Makefile.in.orig Thu Sep 24 09:00:03 1998 -+++ gnome-terminal/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -148,7 +148,7 @@ +--- gnome-terminal/Makefile.in.orig Thu Dec 31 01:54:50 1998 ++++ gnome-terminal/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -153,7 +153,7 @@ -I$(top_srcdir)/intl \ -I$(top_builddir)/intl \ $(GNOME_INCLUDEDIR) \ @@ -273,9 +319,9 @@ LDADD = \ $(GNOME_LIBDIR) \ ---- gsm/Makefile.in.orig Thu Sep 24 08:59:50 1998 -+++ gsm/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -145,7 +145,7 @@ +--- gsm/Makefile.in.orig Thu Dec 31 01:54:44 1998 ++++ gsm/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -150,7 +150,7 @@ INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ @@ -284,38 +330,60 @@ -DDEFAULTDIR="\"$(datadir)\"" LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- panel/Makefile.in.orig Thu Sep 24 09:00:09 1998 -+++ panel/Makefile.in Sun Sep 27 00:00:12 1998 -@@ -151,7 +151,7 @@ +--- help-browser/Makefile.in.orig Thu Dec 31 01:54:48 1998 ++++ help-browser/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -154,8 +154,8 @@ + -I$(includedir) \ + -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + $(GNOME_INCLUDEDIR) \ +- -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" \ +- -DGNOMELOCALEDIR=\""$(datadir)/locale\"" \ ++ -DGNOMEHELPPATH=\""$(datadir)/help\"" \ ++ -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \ + -DVERSION=\""$(VERSION)"\" + + LDADD = \ +@@ -215,7 +215,7 @@ + toc.h toc-man.h toc-ghelp.h toc-info.h \ + $(PIXMAPS) gnome-help.desktop help-browser.gnorba + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/C ++help_browser_helpdir = $(datadir)/help/help-browser/C - INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ + sysdir = $(datadir)/apps + sys_DATA = gnome-help.desktop +--- panel/Makefile.in.orig Thu Dec 31 01:54:53 1998 ++++ panel/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -158,7 +158,7 @@ + -I$(top_srcdir)/intl \ + -I$(top_builddir)/intl \ + -I$(top_builddir)/panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) bin_PROGRAMS = panel -@@ -178,7 +178,7 @@ - applet-widget.h \ +@@ -180,7 +180,7 @@ + gnome-panel.h \ panel-types.h -libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libpanel_applet_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir) ++libpanel_applet_la_LDFLAGS = -version-info 0:99:0 -rpath $(libdir) libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -244,7 +244,7 @@ - panel.in \ - appletsConf.sh.in +@@ -245,7 +245,7 @@ + panel.gnorba \ + panel.soundlist -confexecdir = $(libdir) +confexecdir = $(datadir) confexec_DATA = appletsConf.sh - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- smproxy/Makefile.in.orig Thu Sep 24 08:59:51 1998 -+++ smproxy/Makefile.in Sun Sep 27 00:01:00 1998 -@@ -144,7 +144,7 @@ + + panelgnorbadir = $(sysconfdir)/CORBA/servers +--- smproxy/Makefile.in.orig Thu Dec 31 01:54:45 1998 ++++ smproxy/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -149,7 +149,7 @@ l = @l@ INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \ @@ -324,9 +392,9 @@ LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- core-docs/Makefile.in.orig Thu Sep 24 09:00:04 1998 -+++ core-docs/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -151,7 +151,7 @@ +--- core-docs/Makefile.in.orig Thu Dec 31 01:54:51 1998 ++++ core-docs/Makefile.in Fri Jan 1 11:46:07 1999 +@@ -156,7 +156,7 @@ YACC = @YACC@ l = @l@ @@ -335,87 +403,14 @@ GNOME_INTRO_HTML_FILES = \ gnome-intro/c93191.html \ ---- help-browser/Makefile.in.orig Thu Sep 24 08:59:59 1998 -+++ help-browser/Makefile.in Sat Sep 26 23:48:34 1998 -@@ -149,8 +149,8 @@ - -I$(includedir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - $(GNOME_INCLUDEDIR) \ -- -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -+ -DGNOMEHELPPATH=\""$(datadir)/help\"" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - - LDADD = \ - $(GNOME_LIBDIR) \ -@@ -184,7 +184,7 @@ - toc.h toc-man.h toc-ghelp.h toc-info.h \ - $(PIXMAPS) gnome-help.desktop - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/C -+help_browser_helpdir = $(datadir)/help/help-browser/C - - sysdir = $(datadir)/apps - sys_DATA = gnome-help.desktop ---- capplets/keyboard-properties/Makefile.in.orig Sun Sep 27 00:07:30 1998 -+++ capplets/keyboard-properties/Makefile.in Sun Sep 27 00:07:41 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -I$(srcdir)/../../control-center \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) - - bin_PROGRAMS = keyboard-properties ---- capplets/mouse-properties/Makefile.in.orig Sun Sep 27 00:07:13 1998 -+++ capplets/mouse-properties/Makefile.in Sun Sep 27 00:07:24 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -I$(srcdir)/../../control-center \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) - - bin_PROGRAMS = mouse-properties ---- capplets/screensaver-properties/Makefile.in.orig Sun Sep 27 00:07:49 1998 -+++ capplets/screensaver-properties/Makefile.in Sun Sep 27 00:08:00 1998 -@@ -146,7 +146,7 @@ - INCLUDES = -I. -I$(srcdir) \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -I$(srcdir)/../../control-center \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(includedir) $(GNOME_INCLUDEDIR) - - bin_PROGRAMS = screensaver-properties-capplet ---- control-center/Makefile.in.orig Thu Sep 24 09:00:58 1998 -+++ control-center/Makefile.in Sun Sep 27 03:15:36 1998 -@@ -144,7 +144,7 @@ - l = @l@ - - INCLUDES = \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ - -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -I$(includedir) $(GNOME_INCLUDEDIR) - -@@ -177,7 +177,7 @@ - sysdir = $(datadir)/apps/System - sys_DATA = gnomecc.desktop - --confexecdir = $(libdir) -+confexecdir = $(datadir) - confexec_DATA = cappletConf.sh - - libcapplet_la_SOURCES = \ -@@ -186,7 +186,7 @@ - capplet-widget-libs.h \ - $(CORBA_SRCLIST) - --libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir) - libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) - - include_HEADERS = capplet-widget.h +--- po/Makefile.in.in.orig Thu Dec 31 00:59:06 1998 ++++ po/Makefile.in.in Fri Jan 1 11:46:07 1999 +@@ -18,7 +18,7 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-datadir = $(prefix)/@DATADIRNAME@ ++datadir = $(prefix)/share + localedir = $(datadir)/locale + gnulocaledir = $(prefix)/share/locale + gettextsrcdir = $(prefix)/share/gettext/po |