1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
|
--- 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 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 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 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 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[] = {
- { "/usr/man", TOC_MAN_TYPE },
+ { "/usr/share/man", TOC_MAN_TYPE },
{ "/usr/local/man", TOC_MAN_TYPE },
{ "/usr/X11R6/man", TOC_MAN_TYPE },
- { "/usr/info", TOC_INFO_TYPE },
- { "/opt/gnome/share/gnome/help", TOC_GHELP_TYPE },
- { "/usr/local/share/gnome/help", TOC_GHELP_TYPE },
- { "/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 },
{ 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 =
|
