freebsd-ports/x11/gnomecore/files/patch-ae
1999-01-14 18:55:37 +00:00

438 lines
15 KiB
Text

--- applets/asclock/Makefile.in.orig Wed Jan 13 11:02:10 1999
+++ applets/asclock/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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/battery/Makefile.in.orig Wed Jan 13 11:02:19 1999
+++ applets/battery/Makefile.in Thu Jan 14 21:57:40 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 = battery_applet
--- applets/cdplayer/Makefile.in.orig Wed Jan 13 11:03:09 1999
+++ applets/cdplayer/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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 Wed Jan 13 11:02:21 1999
+++ applets/charpick/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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 Wed Jan 13 11:02:17 1999
+++ applets/clockmail/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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/cpumemusage/Makefile.in.orig Wed Jan 13 11:03:02 1999
+++ applets/cpumemusage/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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/dialer/Makefile.in.orig Wed Jan 13 11:02:12 1999
+++ applets/dialer/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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/diskusage/Makefile.in.orig Wed Jan 13 11:03:03 1999
+++ applets/diskusage/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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)
bin_PROGRAMS = diskusage_applet
--- applets/drivemount/Makefile.in.orig Wed Jan 13 11:02:16 1999
+++ applets/drivemount/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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 = drivemount_applet
--- applets/esd-manager/Makefile.in.orig Wed Jan 13 11:03:01 1999
+++ applets/esd-manager/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,8 +154,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) `esd-config --cflags`
bin_PROGRAMS = esdmanager_applet
--- applets/fifteen/Makefile.in.orig Wed Jan 13 11:02:18 1999
+++ applets/fifteen/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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 Wed Jan 13 11:02:11 1999
+++ applets/fish/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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)
#if DO_EXE
--- applets/fvwm-pager/Makefile.in.orig Wed Jan 13 11:03:14 1999
+++ applets/fvwm-pager/Makefile.in Thu Jan 14 21:57:40 1999
@@ -158,7 +158,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 Wed Jan 13 11:02:08 1999
+++ applets/gen_util/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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/gnome-pager/Makefile.in.orig Wed Jan 13 11:02:22 1999
+++ applets/gnome-pager/Makefile.in Thu Jan 14 21:57:40 1999
@@ -154,7 +154,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 Wed Jan 13 11:03:07 1999
+++ applets/gticker/Makefile.in Thu Jan 14 21:57:41 1999
@@ -152,7 +152,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 Wed Jan 13 11:02:14 1999
+++ applets/icewm-pager/Makefile.in Thu Jan 14 21:57:41 1999
@@ -154,7 +154,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/src/Makefile.in.orig Thu Jan 14 22:01:53 1999
+++ applets/mini-commander/src/Makefile.in Thu Jan 14 22:02:06 1999
@@ -155,7 +155,7 @@
-I$(srcdir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-I$(top_builddir)/panel -I$(top_srcdir)/panel \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(includedir) $(GNOME_INCLUDEDIR)
bin_PROGRAMS = mini_commander_applet
--- applets/mixer/Makefile.in.orig Wed Jan 13 11:03:10 1999
+++ applets/mixer/Makefile.in Thu Jan 14 21:57:41 1999
@@ -154,7 +154,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 Wed Jan 13 11:03:12 1999
+++ applets/modemlights/Makefile.in Thu Jan 14 21:57:41 1999
@@ -154,7 +154,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/multiload/Makefile.in.orig Wed Jan 13 11:03:04 1999
+++ applets/multiload/Makefile.in Thu Jan 14 21:57:41 1999
@@ -151,7 +151,7 @@
l = @l@
INCLUDES = -I. -I$(srcdir) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
-I$(top_builddir)/panel -I$(srcdir)/../../panel \
-I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS)
--- applets/netload/Makefile.in.orig Wed Jan 13 11:03:06 1999
+++ applets/netload/Makefile.in Thu Jan 14 21:57:41 1999
@@ -154,7 +154,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)
--- applets/slashapp/Makefile.in.orig Wed Jan 13 11:03:08 1999
+++ applets/slashapp/Makefile.in Thu Jan 14 21:57:41 1999
@@ -153,7 +153,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 Wed Jan 13 11:02:13 1999
+++ applets/webcontrol/Makefile.in Thu Jan 14 21:57:41 1999
@@ -154,7 +154,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 Wed Jan 13 11:03:13 1999
+++ applets/winlist/Makefile.in Thu Jan 14 21:57:41 1999
@@ -154,7 +154,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
--- gmenu/Makefile.in.orig Wed Jan 13 11:02:03 1999
+++ gmenu/Makefile.in Thu Jan 14 21:57:41 1999
@@ -151,7 +151,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 Wed Jan 13 11:02:01 1999
+++ gnome-terminal/Makefile.in Thu Jan 14 21:57:41 1999
@@ -155,7 +155,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 Wed Jan 13 11:01:45 1999
+++ gsm/Makefile.in Thu Jan 14 21:57:41 1999
@@ -152,7 +152,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)
--- help-browser/Makefile.in.orig Wed Jan 13 11:01:51 1999
+++ help-browser/Makefile.in Thu Jan 14 22:05:11 1999
@@ -156,8 +156,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 = \
--- help-browser/help/C/Makefile.in.orig Fri Jan 15 00:13:50 1999
+++ help-browser/help/C/Makefile.in Fri Jan 15 00:14:00 1999
@@ -154,7 +154,7 @@
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/es/Makefile.in.orig Fri Jan 15 00:14:07 1999
+++ help-browser/help/es/Makefile.in Fri Jan 15 00:14:16 1999
@@ -154,7 +154,7 @@
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/fr/Makefile.in.orig Fri Jan 15 00:14:20 1999
+++ help-browser/help/fr/Makefile.in Fri Jan 15 00:14:32 1999
@@ -154,7 +154,7 @@
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 =
--- panel/Makefile.in.orig Wed Jan 13 11:02:05 1999
+++ panel/Makefile.in Thu Jan 14 22:06:15 1999
@@ -160,7 +160,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
@@ -182,7 +182,7 @@
gnome-panel.h \
panel-types.h
-libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libpanel_applet_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
BUILT_SOURCES = $(CORBA_SRCLIST)
@@ -247,7 +247,7 @@
panel.gnorba \
panel.soundlist
-confexecdir = $(libdir)
+confexecdir = $(datadir)
confexec_DATA = appletsConf.sh
panelgnorbadir = $(sysconfdir)/CORBA/servers
--- smproxy/Makefile.in.orig Wed Jan 13 11:01:47 1999
+++ smproxy/Makefile.in Thu Jan 14 21:57:41 1999
@@ -151,7 +151,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 Wed Jan 13 11:02:02 1999
+++ core-docs/Makefile.in Thu Jan 14 21:57:41 1999
@@ -158,7 +158,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 \
--- po/Makefile.in.in.orig Wed Jan 13 10:18:21 1999
+++ po/Makefile.in.in Thu Jan 14 21:57:41 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
--- applets/mini-commander/docs/Makefile.in.orig Thu Jan 14 22:40:44 1999
+++ applets/mini-commander/docs/Makefile.in Thu Jan 14 22:42:30 1999
@@ -150,7 +150,7 @@
YACC = @YACC@
l = @l@
-docdir = $(datadir)/gnome/help/mini-commander/C
+docdir = $(datadir)/help/mini-commander/C
# .html files which are generated by db2html; precompiled .html files
# are included, so people without db2html (the DocBook to HTML converter)
@@ -183,7 +183,7 @@
TAR = tar
GZIP = --best
-all: Makefile $(DATA)
+all: Makefile
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)