]>
Commit | Line | Data |
---|---|---|
e8aeccb6 AM |
1 | diff -urN control-center-1.4.0.1.org/capplets/background-properties/Makefile.am control-center-1.4.0.1/capplets/background-properties/Makefile.am |
2 | --- control-center-1.4.0.1.org/capplets/background-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
3 | +++ control-center-1.4.0.1/capplets/background-properties/Makefile.am Sun Apr 1 18:52:37 2001 | |
4 | @@ -28,4 +28,4 @@ | |
5 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 6 | |
15d3ce57 | 7 | install-data-local: |
8 | - $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop | |
cb46b7d9 | 9 | + $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop |
e8aeccb6 AM |
10 | diff -urN control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am control-center-1.4.0.1/capplets/desktop-links/Makefile.am |
11 | --- control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am Sun Apr 1 18:49:14 2001 | |
12 | +++ control-center-1.4.0.1/capplets/desktop-links/Makefile.am Sun Apr 1 18:52:37 2001 | |
b9d254ce | 13 | @@ -6,7 +6,7 @@ |
14 | Sessiondir = $(ccenterdir)/Session | |
15 | Documentsdir = $(ccenterdir)/Documents | |
16 | ||
17 | -paneldir = $(datadir)/gnome/apps/Settings | |
cb46b7d9 | 18 | +paneldir = $(datadir)/applnk/Settings/GNOME |
b9d254ce | 19 | Multimediadirp = $(paneldir)/Multimedia |
20 | Desktopdirp = $(paneldir)/Desktop | |
21 | UIOptionsdirp = $(paneldir)/UIOptions | |
e8aeccb6 AM |
22 | diff -urN control-center-1.4.0.1.org/capplets/file-types/Makefile.am control-center-1.4.0.1/capplets/file-types/Makefile.am |
23 | --- control-center-1.4.0.1.org/capplets/file-types/Makefile.am Sun Apr 1 18:49:14 2001 | |
24 | +++ control-center-1.4.0.1/capplets/file-types/Makefile.am Sun Apr 1 18:54:13 2001 | |
25 | @@ -42,7 +42,7 @@ | |
26 | sys_in_files = file-types-capplet.desktop.in | |
27 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
28 | ||
29 | -settingsdir = $(datadir)/gnome/apps/Settings | |
30 | +settingsdir = $(datadir)/applnk/Settings | |
31 | settings_DATA = $(sys_DATA) | |
32 | ||
33 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
34 | diff -urN control-center-1.4.0.1.org/capplets/file-types/Makefile.in control-center-1.4.0.1/capplets/file-types/Makefile.in | |
35 | --- control-center-1.4.0.1.org/capplets/file-types/Makefile.in Sun Apr 1 18:49:14 2001 | |
36 | +++ control-center-1.4.0.1/capplets/file-types/Makefile.in Thu Jan 1 01:00:00 1970 | |
37 | @@ -1,523 +0,0 @@ | |
38 | -# Makefile.in generated automatically by automake 1.4 from Makefile.am | |
39 | - | |
40 | -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. | |
41 | -# This Makefile.in is free software; the Free Software Foundation | |
42 | -# gives unlimited permission to copy and/or distribute it, | |
43 | -# with or without modifications, as long as this notice is preserved. | |
44 | - | |
45 | -# This program is distributed in the hope that it will be useful, | |
46 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without | |
47 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A | |
48 | -# PARTICULAR PURPOSE. | |
49 | - | |
50 | - | |
51 | -SHELL = @SHELL@ | |
52 | - | |
53 | -srcdir = @srcdir@ | |
54 | -top_srcdir = @top_srcdir@ | |
55 | -VPATH = @srcdir@ | |
56 | -prefix = @prefix@ | |
57 | -exec_prefix = @exec_prefix@ | |
58 | - | |
59 | -bindir = @bindir@ | |
60 | -sbindir = @sbindir@ | |
61 | -libexecdir = @libexecdir@ | |
62 | -datadir = @datadir@ | |
63 | -sysconfdir = @sysconfdir@ | |
64 | -sharedstatedir = @sharedstatedir@ | |
65 | -localstatedir = @localstatedir@ | |
66 | -libdir = @libdir@ | |
67 | -infodir = @infodir@ | |
68 | -mandir = @mandir@ | |
69 | -includedir = @includedir@ | |
70 | -oldincludedir = /usr/include | |
71 | - | |
72 | -DESTDIR = | |
73 | - | |
74 | -pkgdatadir = $(datadir)/@PACKAGE@ | |
75 | -pkglibdir = $(libdir)/@PACKAGE@ | |
76 | -pkgincludedir = $(includedir)/@PACKAGE@ | |
77 | - | |
78 | -top_builddir = ../.. | |
79 | - | |
80 | -ACLOCAL = @ACLOCAL@ | |
81 | -AUTOCONF = @AUTOCONF@ | |
82 | -AUTOMAKE = @AUTOMAKE@ | |
83 | -AUTOHEADER = @AUTOHEADER@ | |
84 | - | |
85 | -INSTALL = @INSTALL@ | |
86 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) | |
87 | -INSTALL_DATA = @INSTALL_DATA@ | |
88 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
89 | -transform = @program_transform_name@ | |
90 | - | |
91 | -NORMAL_INSTALL = : | |
92 | -PRE_INSTALL = : | |
93 | -POST_INSTALL = : | |
94 | -NORMAL_UNINSTALL = : | |
95 | -PRE_UNINSTALL = : | |
96 | -POST_UNINSTALL = : | |
97 | -host_alias = @host_alias@ | |
98 | -host_triplet = @host@ | |
99 | -AS = @AS@ | |
100 | -CATALOGS = @CATALOGS@ | |
101 | -CATOBJEXT = @CATOBJEXT@ | |
102 | -CC = @CC@ | |
103 | -CFLAGS = @CFLAGS@ | |
104 | -DATADIRNAME = @DATADIRNAME@ | |
105 | -DLLTOOL = @DLLTOOL@ | |
106 | -DL_LIB = @DL_LIB@ | |
107 | -ESD_CFLAGS = @ESD_CFLAGS@ | |
108 | -ESD_CONFIG = @ESD_CONFIG@ | |
109 | -ESD_LIBS = @ESD_LIBS@ | |
110 | -GDK_IMLIB_CFLAGS = @GDK_IMLIB_CFLAGS@ | |
111 | -GDK_IMLIB_LIBS = @GDK_IMLIB_LIBS@ | |
112 | -GENCAT = @GENCAT@ | |
113 | -GMOFILES = @GMOFILES@ | |
114 | -GMSGFMT = @GMSGFMT@ | |
115 | -GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@ | |
116 | -GNOMEUI_LIBS = @GNOMEUI_LIBS@ | |
117 | -GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@ | |
118 | -GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@ | |
119 | -GNOME_CONFIG = @GNOME_CONFIG@ | |
120 | -GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@ | |
121 | -GNOME_LIBDIR = @GNOME_LIBDIR@ | |
122 | -GNOME_LIBS = @GNOME_LIBS@ | |
123 | -GNORBA_CFLAGS = @GNORBA_CFLAGS@ | |
124 | -GNORBA_LIBS = @GNORBA_LIBS@ | |
125 | -GTKXMHTML_LIBS = @GTKXMHTML_LIBS@ | |
126 | -GTK_CFLAGS = @GTK_CFLAGS@ | |
127 | -GTK_CONFIG = @GTK_CONFIG@ | |
128 | -GTK_LIBS = @GTK_LIBS@ | |
129 | -GT_NO = @GT_NO@ | |
130 | -GT_YES = @GT_YES@ | |
131 | -IMLIB_CFLAGS = @IMLIB_CFLAGS@ | |
132 | -IMLIB_CONFIG = @IMLIB_CONFIG@ | |
133 | -IMLIB_LIBS = @IMLIB_LIBS@ | |
134 | -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ | |
135 | -INSTOBJEXT = @INSTOBJEXT@ | |
136 | -INTLDEPS = @INTLDEPS@ | |
137 | -INTLLIBS = @INTLLIBS@ | |
138 | -INTLOBJS = @INTLOBJS@ | |
139 | -LDFLAGS = @LDFLAGS@ | |
140 | -LEX = @LEX@ | |
141 | -LIBTOOL = @LIBTOOL@ | |
142 | -LN_S = @LN_S@ | |
143 | -MAINT = @MAINT@ | |
144 | -MAKEINFO = @MAKEINFO@ | |
145 | -MKINSTALLDIRS = @MKINSTALLDIRS@ | |
146 | -OBJDUMP = @OBJDUMP@ | |
147 | -ORBIT_CFLAGS = @ORBIT_CFLAGS@ | |
148 | -ORBIT_CONFIG = @ORBIT_CONFIG@ | |
149 | -ORBIT_IDL = @ORBIT_IDL@ | |
150 | -ORBIT_LIBS = @ORBIT_LIBS@ | |
151 | -ORB_CFLAGS = @ORB_CFLAGS@ | |
152 | -ORB_LIBS = @ORB_LIBS@ | |
153 | -PACKAGE = @PACKAGE@ | |
154 | -PIXBUF_CFLAGS = @PIXBUF_CFLAGS@ | |
155 | -PIXBUF_LIBS = @PIXBUF_LIBS@ | |
156 | -POFILES = @POFILES@ | |
157 | -POSUB = @POSUB@ | |
158 | -PTHREAD_LIB = @PTHREAD_LIB@ | |
159 | -RANLIB = @RANLIB@ | |
160 | -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ | |
161 | -USE_NLS = @USE_NLS@ | |
162 | -VERSION = @VERSION@ | |
163 | -VFS_CFLAGS = @VFS_CFLAGS@ | |
164 | -VFS_LIBS = @VFS_LIBS@ | |
165 | -XF86MISC_LIBS = @XF86MISC_LIBS@ | |
166 | -XML_I18N_EXTRACT = @XML_I18N_EXTRACT@ | |
167 | -XML_I18N_MERGE = @XML_I18N_MERGE@ | |
168 | -XML_I18N_TOOLS_PERL = @XML_I18N_TOOLS_PERL@ | |
169 | -XML_I18N_UPDATE = @XML_I18N_UPDATE@ | |
170 | -XPM_LIBS = @XPM_LIBS@ | |
171 | -YACC = @YACC@ | |
172 | -ZVT_LIBS = @ZVT_LIBS@ | |
173 | -cflags_set = @cflags_set@ | |
174 | -cxxflags_set = @cxxflags_set@ | |
175 | -l = @l@ | |
176 | - | |
177 | -NULL = | |
178 | - | |
179 | -SUBDIRS = libuuid | |
180 | - | |
181 | -INCLUDES = -I. -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_srcdir)/libgnomevfs -I$(srcdir)/../../control-center $(GNOME_INCLUDEDIR) $(GTK_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(VFS_CFLAGS) $(WERROR) $(NULL) | |
182 | - | |
183 | - | |
184 | -bin_PROGRAMS = file-types-capplet | |
185 | - | |
186 | -file_types_capplet_SOURCES = file-types-capplet.h file-types-capplet-dialogs.h file-types-icon-entry.h file-types-capplet.c file-types-capplet-dialogs.c file-types-icon-entry.c $(NULL) | |
187 | - | |
188 | - | |
189 | -file_types_capplet_LDADD = ../../control-center/libcapplet.la $(ORBIT_LIBS) $(INTLLIBS) $(VFS_LIBS) -lgdk_pixbuf $/libuuid/libuuid.a $(NULL) | |
190 | - | |
191 | - | |
192 | -sysdir = $(datadir)/control-center/Documents | |
193 | -sys_in_files = file-types-capplet.desktop.in | |
194 | -sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
195 | - | |
196 | -settingsdir = $(datadir)/gnome/apps/Settings | |
197 | -settings_DATA = $(sys_DATA) | |
198 | - | |
199 | -EXTRA_DIST = $(sys_DATA) $(sys_in_files) | |
200 | - | |
201 | -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
202 | -CONFIG_HEADER = ../../config.h | |
203 | -CONFIG_CLEAN_FILES = | |
204 | -PROGRAMS = $(bin_PROGRAMS) | |
205 | - | |
206 | - | |
207 | -DEFS = @DEFS@ -I. -I$(srcdir) -I../.. | |
208 | -CPPFLAGS = @CPPFLAGS@ | |
209 | -LIBS = @LIBS@ | |
210 | -file_types_capplet_OBJECTS = file-types-capplet.o \ | |
211 | -file-types-capplet-dialogs.o file-types-icon-entry.o | |
212 | -file_types_capplet_DEPENDENCIES = ../../control-center/libcapplet.la \ | |
213 | -$/libuuid/libuuid.a | |
214 | -file_types_capplet_LDFLAGS = | |
215 | -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
216 | -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
217 | -CCLD = $(CC) | |
218 | -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ | |
219 | -DATA = $(settings_DATA) $(sys_DATA) | |
220 | - | |
221 | -DIST_COMMON = Makefile.am Makefile.in | |
222 | - | |
223 | - | |
224 | -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) | |
225 | - | |
226 | -TAR = tar | |
227 | -GZIP_ENV = --best | |
228 | -SOURCES = $(file_types_capplet_SOURCES) | |
229 | -OBJECTS = $(file_types_capplet_OBJECTS) | |
230 | - | |
231 | -all: all-redirect | |
232 | -.SUFFIXES: | |
233 | -.SUFFIXES: .S .c .lo .o .s | |
234 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) | |
235 | - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps capplets/file-types/Makefile | |
236 | - | |
237 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
238 | - cd $(top_builddir) \ | |
239 | - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status | |
240 | - | |
241 | - | |
242 | -mostlyclean-binPROGRAMS: | |
243 | - | |
244 | -clean-binPROGRAMS: | |
245 | - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) | |
246 | - | |
247 | -distclean-binPROGRAMS: | |
248 | - | |
249 | -maintainer-clean-binPROGRAMS: | |
250 | - | |
251 | -install-binPROGRAMS: $(bin_PROGRAMS) | |
252 | - @$(NORMAL_INSTALL) | |
253 | - $(mkinstalldirs) $(DESTDIR)$(bindir) | |
254 | - @list='$(bin_PROGRAMS)'; for p in $$list; do \ | |
255 | - if test -f $$p; then \ | |
256 | - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ | |
257 | - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ | |
258 | - else :; fi; \ | |
259 | - done | |
260 | - | |
261 | -uninstall-binPROGRAMS: | |
262 | - @$(NORMAL_UNINSTALL) | |
263 | - list='$(bin_PROGRAMS)'; for p in $$list; do \ | |
264 | - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ | |
265 | - done | |
266 | - | |
267 | -.c.o: | |
268 | - $(COMPILE) -c $< | |
269 | - | |
270 | -.s.o: | |
271 | - $(COMPILE) -c $< | |
272 | - | |
273 | -.S.o: | |
274 | - $(COMPILE) -c $< | |
275 | - | |
276 | -mostlyclean-compile: | |
277 | - -rm -f *.o core *.core | |
278 | - | |
279 | -clean-compile: | |
280 | - | |
281 | -distclean-compile: | |
282 | - -rm -f *.tab.c | |
283 | - | |
284 | -maintainer-clean-compile: | |
285 | - | |
286 | -.c.lo: | |
287 | - $(LIBTOOL) --mode=compile $(COMPILE) -c $< | |
288 | - | |
289 | -.s.lo: | |
290 | - $(LIBTOOL) --mode=compile $(COMPILE) -c $< | |
291 | - | |
292 | -.S.lo: | |
293 | - $(LIBTOOL) --mode=compile $(COMPILE) -c $< | |
294 | - | |
295 | -mostlyclean-libtool: | |
296 | - -rm -f *.lo | |
297 | - | |
298 | -clean-libtool: | |
299 | - -rm -rf .libs _libs | |
300 | - | |
301 | -distclean-libtool: | |
302 | - | |
303 | -maintainer-clean-libtool: | |
304 | - | |
305 | -file-types-capplet: $(file_types_capplet_OBJECTS) $(file_types_capplet_DEPENDENCIES) | |
306 | - @rm -f file-types-capplet | |
307 | - $(LINK) $(file_types_capplet_LDFLAGS) $(file_types_capplet_OBJECTS) $(file_types_capplet_LDADD) $(LIBS) | |
308 | - | |
309 | -install-settingsDATA: $(settings_DATA) | |
310 | - @$(NORMAL_INSTALL) | |
311 | - $(mkinstalldirs) $(DESTDIR)$(settingsdir) | |
312 | - @list='$(settings_DATA)'; for p in $$list; do \ | |
313 | - if test -f $(srcdir)/$$p; then \ | |
314 | - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(settingsdir)/$$p"; \ | |
315 | - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(settingsdir)/$$p; \ | |
316 | - else if test -f $$p; then \ | |
317 | - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(settingsdir)/$$p"; \ | |
318 | - $(INSTALL_DATA) $$p $(DESTDIR)$(settingsdir)/$$p; \ | |
319 | - fi; fi; \ | |
320 | - done | |
321 | - | |
322 | -uninstall-settingsDATA: | |
323 | - @$(NORMAL_UNINSTALL) | |
324 | - list='$(settings_DATA)'; for p in $$list; do \ | |
325 | - rm -f $(DESTDIR)$(settingsdir)/$$p; \ | |
326 | - done | |
327 | - | |
328 | -install-sysDATA: $(sys_DATA) | |
329 | - @$(NORMAL_INSTALL) | |
330 | - $(mkinstalldirs) $(DESTDIR)$(sysdir) | |
331 | - @list='$(sys_DATA)'; for p in $$list; do \ | |
332 | - if test -f $(srcdir)/$$p; then \ | |
333 | - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysdir)/$$p"; \ | |
334 | - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysdir)/$$p; \ | |
335 | - else if test -f $$p; then \ | |
336 | - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysdir)/$$p"; \ | |
337 | - $(INSTALL_DATA) $$p $(DESTDIR)$(sysdir)/$$p; \ | |
338 | - fi; fi; \ | |
339 | - done | |
340 | - | |
341 | -uninstall-sysDATA: | |
342 | - @$(NORMAL_UNINSTALL) | |
343 | - list='$(sys_DATA)'; for p in $$list; do \ | |
344 | - rm -f $(DESTDIR)$(sysdir)/$$p; \ | |
345 | - done | |
346 | - | |
347 | -# This directory's subdirectories are mostly independent; you can cd | |
348 | -# into them and run `make' without going through this Makefile. | |
349 | -# To change the values of `make' variables: instead of editing Makefiles, | |
350 | -# (1) if the variable is set in `config.status', edit `config.status' | |
351 | -# (which will cause the Makefiles to be regenerated when you run `make'); | |
352 | -# (2) otherwise, pass the desired values on the `make' command line. | |
353 | - | |
354 | -@SET_MAKE@ | |
355 | - | |
356 | -all-recursive install-data-recursive install-exec-recursive \ | |
357 | -installdirs-recursive install-recursive uninstall-recursive \ | |
358 | -check-recursive installcheck-recursive info-recursive dvi-recursive: | |
359 | - @set fnord $(MAKEFLAGS); amf=$$2; \ | |
360 | - dot_seen=no; \ | |
361 | - target=`echo $@ | sed s/-recursive//`; \ | |
362 | - list='$(SUBDIRS)'; for subdir in $$list; do \ | |
363 | - echo "Making $$target in $$subdir"; \ | |
364 | - if test "$$subdir" = "."; then \ | |
365 | - dot_seen=yes; \ | |
366 | - local_target="$$target-am"; \ | |
367 | - else \ | |
368 | - local_target="$$target"; \ | |
369 | - fi; \ | |
370 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | |
371 | - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ | |
372 | - done; \ | |
373 | - if test "$$dot_seen" = "no"; then \ | |
374 | - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ | |
375 | - fi; test -z "$$fail" | |
376 | - | |
377 | -mostlyclean-recursive clean-recursive distclean-recursive \ | |
378 | -maintainer-clean-recursive: | |
379 | - @set fnord $(MAKEFLAGS); amf=$$2; \ | |
380 | - dot_seen=no; \ | |
381 | - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ | |
382 | - rev="$$subdir $$rev"; \ | |
383 | - test "$$subdir" = "." && dot_seen=yes; \ | |
384 | - done; \ | |
385 | - test "$$dot_seen" = "no" && rev=". $$rev"; \ | |
386 | - target=`echo $@ | sed s/-recursive//`; \ | |
387 | - for subdir in $$rev; do \ | |
388 | - echo "Making $$target in $$subdir"; \ | |
389 | - if test "$$subdir" = "."; then \ | |
390 | - local_target="$$target-am"; \ | |
391 | - else \ | |
392 | - local_target="$$target"; \ | |
393 | - fi; \ | |
394 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ | |
395 | - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ | |
396 | - done && test -z "$$fail" | |
397 | -tags-recursive: | |
398 | - list='$(SUBDIRS)'; for subdir in $$list; do \ | |
399 | - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | |
400 | - done | |
401 | - | |
402 | -tags: TAGS | |
403 | - | |
404 | -ID: $(HEADERS) $(SOURCES) $(LISP) | |
405 | - list='$(SOURCES) $(HEADERS)'; \ | |
406 | - unique=`for i in $$list; do echo $$i; done | \ | |
407 | - awk ' { files[$$0] = 1; } \ | |
408 | - END { for (i in files) print i; }'`; \ | |
409 | - here=`pwd` && cd $(srcdir) \ | |
410 | - && mkid -f$$here/ID $$unique $(LISP) | |
411 | - | |
412 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) | |
413 | - tags=; \ | |
414 | - here=`pwd`; \ | |
415 | - list='$(SUBDIRS)'; for subdir in $$list; do \ | |
416 | - if test "$$subdir" = .; then :; else \ | |
417 | - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ | |
418 | - fi; \ | |
419 | - done; \ | |
420 | - list='$(SOURCES) $(HEADERS)'; \ | |
421 | - unique=`for i in $$list; do echo $$i; done | \ | |
422 | - awk ' { files[$$0] = 1; } \ | |
423 | - END { for (i in files) print i; }'`; \ | |
424 | - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ | |
425 | - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) | |
426 | - | |
427 | -mostlyclean-tags: | |
428 | - | |
429 | -clean-tags: | |
430 | - | |
431 | -distclean-tags: | |
432 | - -rm -f TAGS ID | |
433 | - | |
434 | -maintainer-clean-tags: | |
435 | - | |
436 | -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) | |
437 | - | |
438 | -subdir = capplets/file-types | |
439 | - | |
440 | -distdir: $(DISTFILES) | |
441 | - @for file in $(DISTFILES); do \ | |
442 | - d=$(srcdir); \ | |
443 | - if test -d $$d/$$file; then \ | |
444 | - cp -pr $$d/$$file $(distdir)/$$file; \ | |
445 | - else \ | |
446 | - test -f $(distdir)/$$file \ | |
447 | - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ | |
448 | - || cp -p $$d/$$file $(distdir)/$$file || :; \ | |
449 | - fi; \ | |
450 | - done | |
451 | - for subdir in $(SUBDIRS); do \ | |
452 | - if test "$$subdir" = .; then :; else \ | |
453 | - test -d $(distdir)/$$subdir \ | |
454 | - || mkdir $(distdir)/$$subdir \ | |
455 | - || exit 1; \ | |
456 | - chmod 777 $(distdir)/$$subdir; \ | |
457 | - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ | |
458 | - || exit 1; \ | |
459 | - fi; \ | |
460 | - done | |
461 | -file-types-capplet-dialogs.o: file-types-capplet-dialogs.c \ | |
462 | - ../../config.h ../../control-center/capplet-widget.h \ | |
463 | - libuuid/uuid.h file-types-capplet.h \ | |
464 | - file-types-capplet-dialogs.h | |
465 | -file-types-capplet.o: file-types-capplet.c ../../config.h \ | |
466 | - ../../control-center/capplet-widget.h \ | |
467 | - file-types-capplet-dialogs.h file-types-icon-entry.h \ | |
468 | - file-types-capplet.h | |
469 | -file-types-icon-entry.o: file-types-icon-entry.c ../../config.h \ | |
470 | - file-types-icon-entry.h file-types-capplet.h | |
471 | - | |
472 | -info-am: | |
473 | -info: info-recursive | |
474 | -dvi-am: | |
475 | -dvi: dvi-recursive | |
476 | -check-am: all-am | |
477 | -check: check-recursive | |
478 | -installcheck-am: | |
479 | -installcheck: installcheck-recursive | |
480 | -install-exec-am: install-binPROGRAMS | |
481 | -install-exec: install-exec-recursive | |
482 | - | |
483 | -install-data-am: install-settingsDATA install-sysDATA | |
484 | -install-data: install-data-recursive | |
485 | - | |
486 | -install-am: all-am | |
487 | - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | |
488 | -install: install-recursive | |
489 | -uninstall-am: uninstall-binPROGRAMS uninstall-settingsDATA \ | |
490 | - uninstall-sysDATA | |
491 | -uninstall: uninstall-recursive | |
492 | -all-am: Makefile $(PROGRAMS) $(DATA) | |
493 | -all-redirect: all-recursive | |
494 | -install-strip: | |
495 | - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install | |
496 | -installdirs: installdirs-recursive | |
497 | -installdirs-am: | |
498 | - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(settingsdir) \ | |
499 | - $(DESTDIR)$(sysdir) | |
500 | - | |
501 | - | |
502 | -mostlyclean-generic: | |
503 | - | |
504 | -clean-generic: | |
505 | - | |
506 | -distclean-generic: | |
507 | - -rm -f Makefile $(CONFIG_CLEAN_FILES) | |
508 | - -rm -f config.cache config.log stamp-h stamp-h[0-9]* | |
509 | - | |
510 | -maintainer-clean-generic: | |
511 | -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ | |
512 | - mostlyclean-libtool mostlyclean-tags \ | |
513 | - mostlyclean-generic | |
514 | - | |
515 | -mostlyclean: mostlyclean-recursive | |
516 | - | |
517 | -clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ | |
518 | - clean-generic mostlyclean-am | |
519 | - | |
520 | -clean: clean-recursive | |
521 | - | |
522 | -distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ | |
523 | - distclean-tags distclean-generic clean-am | |
524 | - -rm -f libtool | |
525 | - | |
526 | -distclean: distclean-recursive | |
527 | - | |
528 | -maintainer-clean-am: maintainer-clean-binPROGRAMS \ | |
529 | - maintainer-clean-compile maintainer-clean-libtool \ | |
530 | - maintainer-clean-tags maintainer-clean-generic \ | |
531 | - distclean-am | |
532 | - @echo "This command is intended for maintainers to use;" | |
533 | - @echo "it deletes files that may require special tools to rebuild." | |
534 | - | |
535 | -maintainer-clean: maintainer-clean-recursive | |
536 | - | |
537 | -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ | |
538 | -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ | |
539 | -mostlyclean-compile distclean-compile clean-compile \ | |
540 | -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ | |
541 | -clean-libtool maintainer-clean-libtool uninstall-settingsDATA \ | |
542 | -install-settingsDATA uninstall-sysDATA install-sysDATA \ | |
543 | -install-data-recursive uninstall-data-recursive install-exec-recursive \ | |
544 | -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ | |
545 | -all-recursive check-recursive installcheck-recursive info-recursive \ | |
546 | -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ | |
547 | -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ | |
548 | -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ | |
549 | -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ | |
550 | -install-exec install-data-am install-data install-am install \ | |
551 | -uninstall-am uninstall all-redirect all-am all installdirs-am \ | |
552 | -installdirs mostlyclean-generic distclean-generic clean-generic \ | |
553 | -maintainer-clean-generic clean mostlyclean distclean maintainer-clean | |
554 | - | |
555 | - | |
556 | -@XML_I18N_MERGE_DESKTOP_RULE@ | |
557 | - | |
558 | -# Tell versions [3.59,3.63) of GNU make to not export all variables. | |
559 | -# Otherwise a system limit (for SysV at least) may be exceeded. | |
560 | -.NOEXPORT: | |
561 | diff -urN control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am | |
562 | --- control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
563 | +++ control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am Sun Apr 1 18:52:37 2001 | |
564 | @@ -24,4 +24,4 @@ | |
565 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 566 | |
15d3ce57 | 567 | install-data-local: |
b9d254ce | 568 | - $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop |
cb46b7d9 | 569 | + $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop |
e8aeccb6 AM |
570 | diff -urN control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am |
571 | --- control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
572 | +++ control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:52:37 2001 | |
573 | @@ -22,4 +22,4 @@ | |
574 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 575 | |
576 | install-data-local: | |
15d3ce57 | 577 | - $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop |
cb46b7d9 | 578 | + $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop |
e8aeccb6 AM |
579 | diff -urN control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am control-center-1.4.0.1/capplets/mouse-properties/Makefile.am |
580 | --- control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
581 | +++ control-center-1.4.0.1/capplets/mouse-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
15d3ce57 | 582 | @@ -23,4 +23,4 @@ |
e8aeccb6 | 583 | @XML_I18N_MERGE_DESKTOP_RULE@ |
fac964b1 | 584 | |
15d3ce57 | 585 | install-data-local: |
586 | - $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop | |
cb46b7d9 | 587 | + $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop |
e8aeccb6 AM |
588 | diff -urN control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am |
589 | --- control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am Sun Apr 1 18:49:13 2001 | |
590 | +++ control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
591 | @@ -31,4 +31,4 @@ | |
592 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 593 | |
15d3ce57 | 594 | install-data-local: |
595 | - $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop | |
cb46b7d9 | 596 | + $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop |
e8aeccb6 AM |
597 | diff -urN control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am control-center-1.4.0.1/capplets/sound-properties/Makefile.am |
598 | --- control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
599 | +++ control-center-1.4.0.1/capplets/sound-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
600 | @@ -24,4 +24,4 @@ | |
601 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 602 | |
15d3ce57 | 603 | install-data-local: |
604 | - $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop | |
cb46b7d9 | 605 | + $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop |
e8aeccb6 AM |
606 | diff -urN control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am control-center-1.4.0.1/capplets/theme-switcher/Makefile.am |
607 | --- control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am Sun Apr 1 18:49:14 2001 | |
608 | +++ control-center-1.4.0.1/capplets/theme-switcher/Makefile.am Sun Apr 1 18:52:39 2001 | |
609 | @@ -34,4 +34,4 @@ | |
610 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 611 | |
15d3ce57 | 612 | install-data-local: |
613 | - $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop | |
cb46b7d9 | 614 | + $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop |
e8aeccb6 AM |
615 | diff -urN control-center-1.4.0.1.org/capplets/url-properties/Makefile.am control-center-1.4.0.1/capplets/url-properties/Makefile.am |
616 | --- control-center-1.4.0.1.org/capplets/url-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
617 | +++ control-center-1.4.0.1/capplets/url-properties/Makefile.am Sun Apr 1 18:52:39 2001 | |
618 | @@ -24,4 +24,4 @@ | |
619 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
fac964b1 | 620 | |
15d3ce57 | 621 | install-data-local: |
b9d254ce | 622 | - $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop |
cb46b7d9 | 623 | + $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop |
e8aeccb6 AM |
624 | diff -urN control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am control-center-1.4.0.1/capplets/wm-properties/Makefile.am |
625 | --- control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am Sun Apr 1 18:49:14 2001 | |
626 | +++ control-center-1.4.0.1/capplets/wm-properties/Makefile.am Sun Apr 1 18:55:37 2001 | |
627 | @@ -26,7 +26,7 @@ | |
628 | sys_in_files = wm-properties.desktop.in | |
629 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
fac964b1 | 630 | |
15d3ce57 | 631 | -Setdir = $(datadir)/gnome/apps/Settings/Desktop |
e8aeccb6 AM |
632 | +Setdir = $(datadir)/applnk/Settings/Desktop |
633 | ||
634 | Set_DATA = $(sys_DATA) | |
635 | ||
636 | diff -urN control-center-1.4.0.1.org/control-center/Makefile.am control-center-1.4.0.1/control-center/Makefile.am | |
637 | --- control-center-1.4.0.1.org/control-center/Makefile.am Sun Apr 1 18:49:15 2001 | |
638 | +++ control-center-1.4.0.1/control-center/Makefile.am Sun Apr 1 18:56:01 2001 | |
b9d254ce | 639 | @@ -47,7 +47,7 @@ |
640 | ||
e8aeccb6 | 641 | EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA) |
fac964b1 | 642 | |
643 | -sysdir = $(datadir)/gnome/apps/Settings | |
644 | +sysdir = $(datadir)/applnk/Settings | |
e8aeccb6 AM |
645 | sys_in_files = gnomecc.desktop.in |
646 | sys_DATA = $(sys_in_files:.desktop.in=.desktop) | |
647 | @XML_I18N_MERGE_DESKTOP_RULE@ | |
648 | diff -urN control-center-1.4.0.1.org/control-center-applnk.patch control-center-1.4.0.1/control-center-applnk.patch | |
649 | --- control-center-1.4.0.1.org/control-center-applnk.patch Thu Jan 1 01:00:00 1970 | |
650 | +++ control-center-1.4.0.1/control-center-applnk.patch Sun Apr 1 18:46:58 2001 | |
651 | @@ -0,0 +1,128 @@ | |
652 | +diff -Nru control-center-1.2.3/capplets/background-properties/Makefile.am control-center-1.2.3.new/capplets/background-properties/Makefile.am | |
653 | +--- control-center-1.2.3/capplets/background-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
654 | ++++ control-center-1.2.3.new/capplets/background-properties/Makefile.am Tue Feb 20 02:33:18 2001 | |
655 | +@@ -26,4 +26,4 @@ | |
656 | + sys_DATA = background-properties.desktop | |
657 | + | |
658 | + install-data-local: | |
659 | +- $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop | |
660 | ++ $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop | |
661 | +diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center-1.2.3.new/capplets/desktop-links/Makefile.am | |
662 | +--- control-center-1.2.3/capplets/desktop-links/Makefile.am Tue Feb 20 02:32:44 2001 | |
663 | ++++ control-center-1.2.3.new/capplets/desktop-links/Makefile.am Tue Feb 20 02:33:37 2001 | |
664 | +@@ -6,7 +6,7 @@ | |
665 | + Sessiondir = $(ccenterdir)/Session | |
666 | + Documentsdir = $(ccenterdir)/Documents | |
667 | + | |
668 | +-paneldir = $(datadir)/gnome/apps/Settings | |
669 | ++paneldir = $(datadir)/applnk/Settings/GNOME | |
670 | + Multimediadirp = $(paneldir)/Multimedia | |
671 | + Desktopdirp = $(paneldir)/Desktop | |
672 | + UIOptionsdirp = $(paneldir)/UIOptions | |
673 | +diff -Nru control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am | |
674 | +--- control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
675 | ++++ control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:33:59 2001 | |
676 | +@@ -21,4 +21,4 @@ | |
677 | + sys_DATA = gnome-edit-properties.desktop | |
678 | + | |
679 | + install-data-local: | |
680 | +- $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop | |
681 | ++ $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop | |
682 | +diff -Nru control-center-1.2.3/capplets/keyboard-properties/Makefile.am control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am | |
683 | +--- control-center-1.2.3/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
684 | ++++ control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:34:28 2001 | |
685 | +@@ -19,4 +19,4 @@ | |
686 | + sys_DATA = keyboard-properties.desktop | |
687 | + | |
688 | + install-data-local: | |
689 | +- $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop | |
690 | ++ $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop | |
691 | +diff -Nru control-center-1.2.3/capplets/mime-type/Makefile.am control-center-1.2.3.new/capplets/mime-type/Makefile.am | |
692 | +--- control-center-1.2.3/capplets/mime-type/Makefile.am Tue Feb 20 02:32:44 2001 | |
693 | ++++ control-center-1.2.3.new/capplets/mime-type/Makefile.am Tue Feb 20 02:34:42 2001 | |
694 | +@@ -23,4 +23,4 @@ | |
695 | + sys_DATA = mime-type.desktop | |
696 | + | |
697 | + install-data-local: | |
698 | +- $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/mime-type.desktop | |
699 | ++ $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/mime-type.desktop | |
700 | +diff -Nru control-center-1.2.3/capplets/mouse-properties/Makefile.am control-center-1.2.3.new/capplets/mouse-properties/Makefile.am | |
701 | +--- control-center-1.2.3/capplets/mouse-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
702 | ++++ control-center-1.2.3.new/capplets/mouse-properties/Makefile.am Tue Feb 20 02:34:57 2001 | |
703 | +@@ -20,4 +20,4 @@ | |
704 | + sys_DATA = mouse-properties.desktop | |
705 | + | |
706 | + install-data-local: | |
707 | +- $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop | |
708 | ++ $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop | |
709 | +diff -Nru control-center-1.2.3/capplets/screensaver-properties/Makefile.am control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am | |
710 | +--- control-center-1.2.3/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
711 | ++++ control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:35:13 2001 | |
712 | +@@ -29,4 +29,4 @@ | |
713 | + sys_DATA = screensaver-properties.desktop | |
714 | + | |
715 | + install-data-local: | |
716 | +- $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop | |
717 | ++ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop | |
718 | +diff -Nru control-center-1.2.3/capplets/sound-properties/Makefile.am control-center-1.2.3.new/capplets/sound-properties/Makefile.am | |
719 | +--- control-center-1.2.3/capplets/sound-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
720 | ++++ control-center-1.2.3.new/capplets/sound-properties/Makefile.am Tue Feb 20 02:35:41 2001 | |
721 | +@@ -21,4 +21,4 @@ | |
722 | + sys_DATA = sound-properties.desktop | |
723 | + | |
724 | + install-data-local: | |
725 | +- $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop | |
726 | ++ $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop | |
727 | +diff -Nru control-center-1.2.3/capplets/theme-switcher/Makefile.am control-center-1.2.3.new/capplets/theme-switcher/Makefile.am | |
728 | +--- control-center-1.2.3/capplets/theme-switcher/Makefile.am Tue Feb 20 02:32:44 2001 | |
729 | ++++ control-center-1.2.3.new/capplets/theme-switcher/Makefile.am Tue Feb 20 02:35:55 2001 | |
730 | +@@ -31,4 +31,4 @@ | |
731 | + sys_DATA = theme-selector.desktop | |
732 | + | |
733 | + install-data-local: | |
734 | +- $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop | |
735 | ++ $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop | |
736 | +diff -Nru control-center-1.2.3/capplets/ui-properties/Makefile.am control-center-1.2.3.new/capplets/ui-properties/Makefile.am | |
737 | +--- control-center-1.2.3/capplets/ui-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
738 | ++++ control-center-1.2.3.new/capplets/ui-properties/Makefile.am Tue Feb 20 02:36:16 2001 | |
739 | +@@ -27,6 +27,6 @@ | |
740 | + mdi.desktop | |
741 | + | |
742 | + install-data-local: | |
743 | +- $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop | |
744 | +- $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop | |
745 | +- $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop | |
746 | ++ $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/application.desktop | |
747 | ++ $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/dialogs.desktop | |
748 | ++ $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/mdi.desktop | |
749 | +diff -Nru control-center-1.2.3/capplets/url-properties/Makefile.am control-center-1.2.3.new/capplets/url-properties/Makefile.am | |
750 | +--- control-center-1.2.3/capplets/url-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
751 | ++++ control-center-1.2.3.new/capplets/url-properties/Makefile.am Tue Feb 20 02:36:28 2001 | |
752 | +@@ -21,4 +21,4 @@ | |
753 | + sys_DATA = url-properties.desktop | |
754 | + | |
755 | + install-data-local: | |
756 | +- $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop | |
757 | ++ $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop | |
758 | +diff -Nru control-center-1.2.3/capplets/wm-properties/Makefile.am control-center-1.2.3.new/capplets/wm-properties/Makefile.am | |
759 | +--- control-center-1.2.3/capplets/wm-properties/Makefile.am Tue Feb 20 02:32:44 2001 | |
760 | ++++ control-center-1.2.3.new/capplets/wm-properties/Makefile.am Tue Feb 20 02:36:46 2001 | |
761 | +@@ -25,5 +25,5 @@ | |
762 | + sysdir = $(datadir)/control-center/Desktop | |
763 | + sys_DATA = wm-properties.desktop | |
764 | + | |
765 | +-Setdir = $(datadir)/gnome/apps/Settings/Desktop | |
766 | ++Setdir = $(datadir)/applnk/Settings/GNOME/Desktop | |
767 | + Set_DATA = wm-properties.desktop | |
768 | +diff -Nru control-center-1.2.3/control-center/Makefile.am control-center-1.2.3.new/control-center/Makefile.am | |
769 | +--- control-center-1.2.3/control-center/Makefile.am Tue Feb 20 02:32:44 2001 | |
770 | ++++ control-center-1.2.3.new/control-center/Makefile.am Tue Feb 20 02:31:47 2001 | |
771 | +@@ -47,7 +47,7 @@ | |
772 | + | |
773 | + EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA) | |
774 | + | |
775 | +-sysdir = $(datadir)/gnome/apps/Settings | |
776 | ++sysdir = $(datadir)/applnk/Settings | |
777 | + sys_DATA = gnomecc.desktop | |
778 | + | |
779 | + ## Put `exec' in the name because this should be installed by |