--- 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) \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) 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 \ -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 \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) \ -I$(LIBGTOP_INCS) --- 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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) 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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) 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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) 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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../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 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) 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 @@ l = @l@ INCLUDES = -I. -I$(srcdir) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -I$(srcdir)/../../panel \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) 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 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -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) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ -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 @@ l = @l@ INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -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 @@ -I$(top_srcdir)/intl \ -I$(top_builddir)/intl \ $(GNOME_INCLUDEDIR) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale\"" + -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" 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 @@ INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -DGNOMELOCALEDIR=\""$(datadir)/locale\"" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" \ -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 @@ INCLUDES = -I. -I$(srcdir) \ -I$(top_srcdir)/intl -I$(top_builddir)/intl \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \ -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) bin_PROGRAMS = panel @@ -178,7 +178,7 @@ applet-widget.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_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) BUILT_SOURCES = $(CORBA_SRCLIST) @@ -244,7 +244,7 @@ panel.in \ appletsConf.sh.in -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 @@ l = @l@ INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale\"" + -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" 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 @@ YACC = @YACC@ 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 \ --- 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