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
5 @XML_I18N_MERGE_DESKTOP_RULE@
8 - $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
9 + $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
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
14 Sessiondir = $(ccenterdir)/Session
15 Documentsdir = $(ccenterdir)/Documents
17 -paneldir = $(datadir)/gnome/apps/Settings
18 +paneldir = $(datadir)/applnk/Settings/GNOME
19 Multimediadirp = $(paneldir)/Multimedia
20 Desktopdirp = $(paneldir)/Desktop
21 UIOptionsdirp = $(paneldir)/UIOptions
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
26 sys_in_files = file-types-capplet.desktop.in
27 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
29 -settingsdir = $(datadir)/gnome/apps/Settings
30 +settingsdir = $(datadir)/applnk/Settings
31 settings_DATA = $(sys_DATA)
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
38 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
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.
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.
54 -top_srcdir = @top_srcdir@
57 -exec_prefix = @exec_prefix@
61 -libexecdir = @libexecdir@
63 -sysconfdir = @sysconfdir@
64 -sharedstatedir = @sharedstatedir@
65 -localstatedir = @localstatedir@
69 -includedir = @includedir@
70 -oldincludedir = /usr/include
74 -pkgdatadir = $(datadir)/@PACKAGE@
75 -pkglibdir = $(libdir)/@PACKAGE@
76 -pkgincludedir = $(includedir)/@PACKAGE@
81 -AUTOCONF = @AUTOCONF@
82 -AUTOMAKE = @AUTOMAKE@
83 -AUTOHEADER = @AUTOHEADER@
86 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
87 -INSTALL_DATA = @INSTALL_DATA@
88 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
89 -transform = @program_transform_name@
97 -host_alias = @host_alias@
98 -host_triplet = @host@
100 -CATALOGS = @CATALOGS@
101 -CATOBJEXT = @CATOBJEXT@
104 -DATADIRNAME = @DATADIRNAME@
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@
113 -GMOFILES = @GMOFILES@
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@
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@
144 -MAKEINFO = @MAKEINFO@
145 -MKINSTALLDIRS = @MKINSTALLDIRS@
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@
154 -PIXBUF_CFLAGS = @PIXBUF_CFLAGS@
155 -PIXBUF_LIBS = @PIXBUF_LIBS@
158 -PTHREAD_LIB = @PTHREAD_LIB@
160 -USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
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@
172 -ZVT_LIBS = @ZVT_LIBS@
173 -cflags_set = @cflags_set@
174 -cxxflags_set = @cxxflags_set@
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)
184 -bin_PROGRAMS = file-types-capplet
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)
189 -file_types_capplet_LDADD = ../../control-center/libcapplet.la $(ORBIT_LIBS) $(INTLLIBS) $(VFS_LIBS) -lgdk_pixbuf $/libuuid/libuuid.a $(NULL)
192 -sysdir = $(datadir)/control-center/Documents
193 -sys_in_files = file-types-capplet.desktop.in
194 -sys_DATA = $(sys_in_files:.desktop.in=.desktop)
196 -settingsdir = $(datadir)/gnome/apps/Settings
197 -settings_DATA = $(sys_DATA)
199 -EXTRA_DIST = $(sys_DATA) $(sys_in_files)
201 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
202 -CONFIG_HEADER = ../../config.h
203 -CONFIG_CLEAN_FILES =
204 -PROGRAMS = $(bin_PROGRAMS)
207 -DEFS = @DEFS@ -I. -I$(srcdir) -I../..
208 -CPPFLAGS = @CPPFLAGS@
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 \
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)
218 -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
219 -DATA = $(settings_DATA) $(sys_DATA)
221 -DIST_COMMON = Makefile.am Makefile.in
224 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
228 -SOURCES = $(file_types_capplet_SOURCES)
229 -OBJECTS = $(file_types_capplet_OBJECTS)
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
237 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
238 - cd $(top_builddir) \
239 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
242 -mostlyclean-binPROGRAMS:
245 - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
247 -distclean-binPROGRAMS:
249 -maintainer-clean-binPROGRAMS:
251 -install-binPROGRAMS: $(bin_PROGRAMS)
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)/'`; \
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)/'`; \
276 -mostlyclean-compile:
277 - -rm -f *.o core *.core
284 -maintainer-clean-compile:
287 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
290 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
293 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
295 -mostlyclean-libtool:
299 - -rm -rf .libs _libs
303 -maintainer-clean-libtool:
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)
309 -install-settingsDATA: $(settings_DATA)
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; \
322 -uninstall-settingsDATA:
323 - @$(NORMAL_UNINSTALL)
324 - list='$(settings_DATA)'; for p in $$list; do \
325 - rm -f $(DESTDIR)$(settingsdir)/$$p; \
328 -install-sysDATA: $(sys_DATA)
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; \
342 - @$(NORMAL_UNINSTALL)
343 - list='$(sys_DATA)'; for p in $$list; do \
344 - rm -f $(DESTDIR)$(sysdir)/$$p; \
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.
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; \
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 \
366 - local_target="$$target-am"; \
368 - local_target="$$target"; \
370 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
371 - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
373 - if test "$$dot_seen" = "no"; then \
374 - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
375 - fi; test -z "$$fail"
377 -mostlyclean-recursive clean-recursive distclean-recursive \
378 -maintainer-clean-recursive:
379 - @set fnord $(MAKEFLAGS); amf=$$2; \
381 - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
382 - rev="$$subdir $$rev"; \
383 - test "$$subdir" = "." && dot_seen=yes; \
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"; \
392 - local_target="$$target"; \
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"
398 - list='$(SUBDIRS)'; for subdir in $$list; do \
399 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
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)
412 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
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"; \
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)
434 -maintainer-clean-tags:
436 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
438 -subdir = capplets/file-types
440 -distdir: $(DISTFILES)
441 - @for file in $(DISTFILES); do \
443 - if test -d $$d/$$file; then \
444 - cp -pr $$d/$$file $(distdir)/$$file; \
446 - test -f $(distdir)/$$file \
447 - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
448 - || cp -p $$d/$$file $(distdir)/$$file || :; \
451 - for subdir in $(SUBDIRS); do \
452 - if test "$$subdir" = .; then :; else \
453 - test -d $(distdir)/$$subdir \
454 - || mkdir $(distdir)/$$subdir \
456 - chmod 777 $(distdir)/$$subdir; \
457 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
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
473 -info: info-recursive
477 -check: check-recursive
479 -installcheck: installcheck-recursive
480 -install-exec-am: install-binPROGRAMS
481 -install-exec: install-exec-recursive
483 -install-data-am: install-settingsDATA install-sysDATA
484 -install-data: install-data-recursive
487 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
488 -install: install-recursive
489 -uninstall-am: uninstall-binPROGRAMS uninstall-settingsDATA \
491 -uninstall: uninstall-recursive
492 -all-am: Makefile $(PROGRAMS) $(DATA)
493 -all-redirect: all-recursive
495 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
496 -installdirs: installdirs-recursive
498 - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(settingsdir) \
499 - $(DESTDIR)$(sysdir)
502 -mostlyclean-generic:
507 - -rm -f Makefile $(CONFIG_CLEAN_FILES)
508 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
510 -maintainer-clean-generic:
511 -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
512 - mostlyclean-libtool mostlyclean-tags \
513 - mostlyclean-generic
515 -mostlyclean: mostlyclean-recursive
517 -clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \
518 - clean-generic mostlyclean-am
520 -clean: clean-recursive
522 -distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \
523 - distclean-tags distclean-generic clean-am
526 -distclean: distclean-recursive
528 -maintainer-clean-am: maintainer-clean-binPROGRAMS \
529 - maintainer-clean-compile maintainer-clean-libtool \
530 - maintainer-clean-tags maintainer-clean-generic \
532 - @echo "This command is intended for maintainers to use;"
533 - @echo "it deletes files that may require special tools to rebuild."
535 -maintainer-clean: maintainer-clean-recursive
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
556 -@XML_I18N_MERGE_DESKTOP_RULE@
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.
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
565 @XML_I18N_MERGE_DESKTOP_RULE@
568 - $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
569 + $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
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
574 @XML_I18N_MERGE_DESKTOP_RULE@
577 - $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
578 + $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
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
583 @XML_I18N_MERGE_DESKTOP_RULE@
586 - $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
587 + $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
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
592 @XML_I18N_MERGE_DESKTOP_RULE@
595 - $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
596 + $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
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
601 @XML_I18N_MERGE_DESKTOP_RULE@
604 - $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
605 + $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
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
610 @XML_I18N_MERGE_DESKTOP_RULE@
613 - $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
614 + $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
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
619 @XML_I18N_MERGE_DESKTOP_RULE@
622 - $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
623 + $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
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
628 sys_in_files = wm-properties.desktop.in
629 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
631 -Setdir = $(datadir)/gnome/apps/Settings/Desktop
632 +Setdir = $(datadir)/applnk/Settings/Desktop
634 Set_DATA = $(sys_DATA)
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
641 EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
643 -sysdir = $(datadir)/gnome/apps/Settings
644 +sysdir = $(datadir)/applnk/Settings
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
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
656 + sys_DATA = background-properties.desktop
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
665 + Sessiondir = $(ccenterdir)/Session
666 + Documentsdir = $(ccenterdir)/Documents
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
677 + sys_DATA = gnome-edit-properties.desktop
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
686 + sys_DATA = keyboard-properties.desktop
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
695 + sys_DATA = mime-type.desktop
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
704 + sys_DATA = mouse-properties.desktop
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
713 + sys_DATA = screensaver-properties.desktop
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
722 + sys_DATA = sound-properties.desktop
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
731 + sys_DATA = theme-selector.desktop
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
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
753 + sys_DATA = url-properties.desktop
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
762 + sysdir = $(datadir)/control-center/Desktop
763 + sys_DATA = wm-properties.desktop
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
773 + EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
775 +-sysdir = $(datadir)/gnome/apps/Settings
776 ++sysdir = $(datadir)/applnk/Settings
777 + sys_DATA = gnomecc.desktop
779 + ## Put `exec' in the name because this should be installed by